GNOME.org
 

[hyena/gtk3: 13/13] Merge remote branch 'gtk3/master' into gtk3

commit 1659343a86cff9aa98d3f67ff8a02b56d4222497
Merge: 92c69dd 2611349
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Thu Apr 28 11:56:51 2011 -0500

    Merge remote branch 'gtk3/master' into gtk3
    
    Resolved conflict in that a11y is no longer optional.
    
    Conflicts:
    	Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Table.cs
    	configure.ac

 .../Accessibility/ListViewAccessible_Table.cs      |   11 +---
 Hyena.Gui/Hyena.Data.Gui/CellContext.cs            |    2 +-
 Hyena.Gui/Hyena.Data.Gui/ColumnCellCheckBox.cs     |    7 +-
 .../Hyena.Data.Gui/ListView/ListView_Accessible.cs |   28 ++++-----
 .../Hyena.Data.Gui/ListView/ListView_Header.cs     |    2 +-
 .../ListView/ListView_Interaction.cs               |   16 ++--
 .../Hyena.Data.Gui/ListView/ListView_Rendering.cs  |   15 +++--
 .../Hyena.Data.Gui/ListView/ListView_Windowing.cs  |   35 +++++++---
 Hyena.Gui/Hyena.Gui.Canvas/CanvasHost.cs           |   33 +++++++---
 Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs     |    5 +-
 .../Hyena.Gui.Dialogs/VersionInformationDialog.cs  |    6 +-
 Hyena.Gui/Hyena.Gui.Theming/GtkTheme.cs            |    8 --
 Hyena.Gui/Hyena.Gui.Theming/ThemeTestModule.cs     |   25 +++----
 Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs        |    7 +-
 Hyena.Gui/Hyena.Gui/CairoExtensions.cs             |    3 +-
 Hyena.Gui/Hyena.Gui/CompositeUtils.cs              |   35 +---------
 Hyena.Gui/Hyena.Gui/EditableUndoAdapter.cs         |    2 +-
 Hyena.Gui/Hyena.Gui/GtkUtilities.cs                |   17 +----
 Hyena.Gui/Hyena.Gui/HyenaActionGroup.cs            |    4 +-
 Hyena.Gui/Hyena.Gui/ShadingTestWindow.cs           |    5 +-
 .../Hyena.Query.Gui/FileSizeQueryValueEntry.cs     |    4 +-
 Hyena.Gui/Hyena.Query.Gui/QueryBox.cs              |    6 +-
 Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs         |    8 +-
 Hyena.Gui/Hyena.Query.Gui/QueryTermBox.cs          |   16 ++---
 .../Hyena.Query.Gui/TimeSpanQueryValueEntry.cs     |    4 +-
 Hyena.Gui/Hyena.Widgets/AnimatedBox.cs             |   25 ++++++-
 Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs          |   51 ++++++++++-----
 Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs         |   32 ++++++---
 Hyena.Gui/Hyena.Widgets/EntryPopup.cs              |   15 ++--
 Hyena.Gui/Hyena.Widgets/GrabHandle.cs              |   15 +++--
 Hyena.Gui/Hyena.Widgets/HigMessageDialog.cs        |    5 +-
 Hyena.Gui/Hyena.Widgets/MenuButton.cs              |   18 ++++--
 Hyena.Gui/Hyena.Widgets/MessageBar.cs              |   20 ++----
 Hyena.Gui/Hyena.Widgets/PulsingButton.cs           |   11 ++--
 Hyena.Gui/Hyena.Widgets/RatingEntry.cs             |   68 ++++++++++++--------
 Hyena.Gui/Hyena.Widgets/RoundedFrame.cs            |   47 ++++++++------
 Hyena.Gui/Hyena.Widgets/SegmentedBar.cs            |   26 ++++---
 Hyena.Gui/Hyena.Widgets/TextViewEditable.cs        |    4 +-
 Hyena.Gui/Hyena.Widgets/WrapLabel.cs               |   40 ++++++++++--
 Hyena.Gui/Makefile.am                              |    3 +-
 configure.ac                                       |   10 ++-
 41 files changed, 384 insertions(+), 310 deletions(-)
---
diff --cc Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Table.cs
index fb27e30,9697de9..e652d70
--- a/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Table.cs
+++ b/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Table.cs
@@@ -124,15 -125,14 +124,8 @@@ namespace Hyena.Data.Gui.Accessibilit
              return new Atk.NoOpObject (list_view);
          }
  
--// Ensure https://bugzilla.novell.com/show_bug.cgi?id=512477 is fixed
-         private static readonly int [] empty_int_array = new int[0];
-         public int [] SelectedColumns {
-             get { return empty_int_array; }
-         }
- 
-         public int [] SelectedRows {
-             get { return list_view.Selection.ToArray (); }
-         }
 -#if ENABLE_ATK
+         public int GetSelectedRows (out int row) { row = 0; return 0; }
+         public int GetSelectedColumns (out int cols) { cols = 0; return 0; }
 -#else
 -        public int GetSelectedRows (out int row) { row = 0; return 0; }
 -        public int GetSelectedColumns (out int cols) { cols = 0; return 0; }
 -#endif
  
          public bool IsColumnSelected (int column)
          {
diff --cc Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs
index 3cdabeb,e55a4e8..7b991e7
--- a/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs
+++ b/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs
@@@ -159,19 -166,16 +159,15 @@@ namespace Hyena.Data.Gu
          {
              new ListViewAccessibleFactory<T> ();
              Atk.Global.DefaultRegistry.SetFactoryType ((GLib.GType)typeof (ListView<T>), (GLib.GType)typeof (ListViewAccessibleFactory<T>));
-         }
- 
-         protected override Atk.Object OnCreateAccessible (GLib.Object obj)
-         {
-             Log.InformationFormat ("Creating Accessible for {0}", obj);
-             var accessible = new ListViewAccessible<T> (obj);
-             (obj as ListView<T>).accessible = accessible;
-             return accessible;
-         }
- 
-         protected override GLib.GType OnGetAccessibleType ()
-         {
-             return ListViewAccessible<T>.GType;
+             CreateAccessibleHandler = (obj) => {
+                 Log.InformationFormat ("Creating Accessible for {0}", obj);
+                 var accessible = new ListViewAccessible<T> (obj);
+                 (obj as ListView<T>).accessible = accessible;
+                 return accessible;
+             };
+             GetAccessibleTypeHandler = ()=> {
+                 return ListViewAccessible<T>.GType;
+             };
          }
      }
 -#endif
  }
diff --cc Hyena.Gui/Hyena.Widgets/RatingEntry.cs
index e6a49ba,4accfd1..c603c1c
--- a/Hyena.Gui/Hyena.Widgets/RatingEntry.cs
+++ b/Hyena.Gui/Hyena.Widgets/RatingEntry.cs
@@@ -444,18 -468,16 +463,15 @@@ namespace Hyena.Widget
          {
              new RatingAccessibleFactory ();
              Atk.Global.DefaultRegistry.SetFactoryType ((GLib.GType)typeof (RatingEntry), (GLib.GType)typeof (RatingAccessibleFactory));
-         }
+             CreateAccessibleHandler = (obj) => {
+                 return new RatingAccessible (obj);
+             };
+             GetAccessibleTypeHandler = () => {
+                 return RatingAccessible.GType;
+             };
  
-         protected override Atk.Object OnCreateAccessible (GLib.Object obj)
-         {
-             return new RatingAccessible (obj);
-         }
- 
-         protected override GLib.GType OnGetAccessibleType ()
-         {
-             return RatingAccessible.GType;
          }
      }
 -#endif
  
      [Hyena.Gui.TestModule ("Rating Entry")]
      internal class RatingEntryTestModule : Gtk.Window
diff --cc configure.ac
index fd1ccae,5fe8fab..172922a
--- a/configure.ac
+++ b/configure.ac
@@@ -51,16 -51,22 +51,18 @@@ dnl Mono and gmc
  SHAMROCK_CHECK_MONO_MODULE(1.9.1)
  SHAMROCK_FIND_MONO_2_0_COMPILER
  SHAMROCK_FIND_MONO_RUNTIME
+ 
+ 
  SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([	
- 	Mono.Cairo
  	Mono.Posix
  	ICSharpCode.SharpZipLib
- ])
+ ])dnl FIXME:seems like cairo-sharp hasn't got .pc files yet: cairo-sharp
+ 
  
  dnl package checks, common for all configs
- PKG_CHECK_MODULES([GTKSHARP], gtk-sharp-2.0 >= 2.12.10)
- PKG_CHECK_MODULES([GLIBSHARP], glib-sharp-2.0)
+ PKG_CHECK_MODULES([GTKSHARP], [gtk-sharp-3.0])
+ PKG_CHECK_MODULES([GLIBSHARP], [glib-sharp-3.0])
  
 -dnl See if Gtk# is recent enought to enable managed widget a11y
 -#PKG_CHECK_MODULES(GTKSHARP_A11Y, gtk-sharp-3.0 >= 4.0, gtksharp_with_a11y=yes, gtksharp_with_a11y=no)
 -AM_CONDITIONAL(ENABLE_ATK, test "x$gtksharp_with_a11y" = "xyes")
 -
  AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)
  AM_CONDITIONAL(HYENA_PKG_CONFIG, true)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]