GNOME.org
 

[hyena] cleanup: Remove ATK conditional; now required

commit 0e42f82dcefa197d07a5826ba49df039af8f184c
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Tue Apr 26 21:33:41 2011 -0500

    cleanup: Remove ATK conditional; now required
    
    Require Gtk# >= 2.12.10

 .../Accessibility/ColumnCellAccessible.cs          |    2 --
 .../ColumnHeaderCellTextAccessible.cs              |    2 --
 .../Accessibility/ListViewAccessible.cs            |    2 --
 .../Accessibility/ListViewAccessible_Selection.cs  |    2 --
 .../Accessibility/ListViewAccessible_Table.cs      |    7 -------
 .../Hyena.Data.Gui/ListView/ListView_Accessible.cs |    8 --------
 Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs        |    2 --
 Hyena.Gui/Hyena.Widgets/RatingEntry.cs             |    6 ------
 build/build.rules.mk                               |    6 +-----
 configure.ac                                       |    9 ++-------
 10 files changed, 3 insertions(+), 43 deletions(-)
---
diff --git a/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnCellAccessible.cs b/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnCellAccessible.cs
index f0e797a..10dbc4e 100644
--- a/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnCellAccessible.cs
+++ b/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnCellAccessible.cs
@@ -45,7 +45,6 @@ namespace Hyena.Data.Gui.Accessibility
             Parent = (Atk.Object) parent;
         }
 
-#if ENABLE_ATK
         protected override Atk.StateSet OnRefStateSet ()
         {
             Atk.StateSet states = base.OnRefStateSet ();
@@ -74,7 +73,6 @@ namespace Hyena.Data.Gui.Accessibility
         {
             return cell_parent.GetCellIndex (this);
         }
-#endif
 
         public double Alpha {
             get { return 1.0; }
diff --git a/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs b/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs
index 2b6704f..1638fa6 100644
--- a/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs
+++ b/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs
@@ -48,7 +48,6 @@ namespace Hyena.Data.Gui.Accessibility
             Role = Atk.Role.TableColumnHeader;
         }
 
-#if ENABLE_ATK
         protected override Atk.StateSet OnRefStateSet ()
         {
             Atk.StateSet states = base.OnRefStateSet ();
@@ -56,7 +55,6 @@ namespace Hyena.Data.Gui.Accessibility
             states.RemoveState (Atk.StateType.Transient);
             return states;
         }
-#endif
 
         public string GetLocalizedName (int action)
         {
diff --git a/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible.cs b/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible.cs
index 48220e2..12de9cd 100644
--- a/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible.cs
+++ b/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible.cs
@@ -36,7 +36,6 @@ using Hyena.Data.Gui;
 
 namespace Hyena.Data.Gui.Accessibility
 {
-#if ENABLE_ATK
     public partial class ListViewAccessible<T> : Hyena.Gui.BaseWidgetAccessible, ICellAccessibleParent
     {
         private ListView<T> list_view;
@@ -268,5 +267,4 @@ namespace Hyena.Data.Gui.Accessibility
 
         #endregion
     }
-#endif
 }
diff --git a/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Selection.cs b/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Selection.cs
index caa6728..9036788 100644
--- a/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Selection.cs
+++ b/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Selection.cs
@@ -36,7 +36,6 @@ using Hyena.Data.Gui;
 
 namespace Hyena.Data.Gui.Accessibility
 {
-#if ENABLE_ATK
     public partial class ListViewAccessible<T> : Atk.SelectionImplementor
     {
         public void ListViewAccessible_Selection ()
@@ -88,5 +87,4 @@ namespace Hyena.Data.Gui.Accessibility
             GLib.Signal.Emit (this, "selection_changed");
         }
     }
-#endif
 }
diff --git a/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Table.cs b/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Table.cs
index ed43a8c..fb27e30 100644
--- a/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Table.cs
+++ b/Hyena.Gui/Hyena.Data.Gui/Accessibility/ListViewAccessible_Table.cs
@@ -36,7 +36,6 @@ using Hyena.Data.Gui;
 
 namespace Hyena.Data.Gui.Accessibility
 {
-#if ENABLE_ATK
     public partial class ListViewAccessible<T> : Atk.TableImplementor
     {
         public void ListViewAccessible_Table ()
@@ -126,7 +125,6 @@ namespace Hyena.Data.Gui.Accessibility
         }
 
 // Ensure https://bugzilla.novell.com/show_bug.cgi?id=512477 is fixed
-#if ENABLE_ATK
         private static readonly int [] empty_int_array = new int[0];
         public int [] SelectedColumns {
             get { return empty_int_array; }
@@ -135,10 +133,6 @@ namespace Hyena.Data.Gui.Accessibility
         public int [] SelectedRows {
             get { return list_view.Selection.ToArray (); }
         }
-#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)
         {
@@ -188,5 +182,4 @@ namespace Hyena.Data.Gui.Accessibility
         {
         }
     }
-#endif
 }
diff --git a/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs b/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs
index e6e9869..3cdabeb 100644
--- a/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs
+++ b/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Accessible.cs
@@ -40,15 +40,11 @@ namespace Hyena.Data.Gui
 {
     public partial class ListView<T> : ListViewBase
     {
-#if ENABLE_ATK
         internal ListViewAccessible<T> accessible;
-#endif
 
         static ListView ()
         {
-#if ENABLE_ATK
             ListViewAccessibleFactory<T>.Init ();
-#endif
         }
 
         public Gdk.Rectangle GetColumnCellExtents (int row, int column)
@@ -150,16 +146,13 @@ namespace Hyena.Data.Gui
 
         private void AccessibleCellRedrawn (int column, int row)
         {
-#if ENABLE_ATK
             if (accessible != null) {
                 accessible.CellRedrawn (column, row);
             }
-#endif
         }
 
     }
 
-#if ENABLE_ATK
     internal class ListViewAccessibleFactory<T> : Atk.ObjectFactory
     {
         public static void Init ()
@@ -181,5 +174,4 @@ namespace Hyena.Data.Gui
             return ListViewAccessible<T>.GType;
         }
     }
-#endif
 }
diff --git a/Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs b/Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs
index dea5da0..1553728 100644
--- a/Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs
+++ b/Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs
@@ -34,7 +34,6 @@ using Atk;
 
 namespace Hyena.Gui
 {
-#if ENABLE_ATK
     public class BaseWidgetAccessible : Gtk.Accessible, Atk.ComponentImplementor
     {
         private Gtk.Widget widget;
@@ -258,5 +257,4 @@ namespace Hyena.Gui
         #endregion Atk.Component
 
     }
-#endif
 }
diff --git a/Hyena.Gui/Hyena.Widgets/RatingEntry.cs b/Hyena.Gui/Hyena.Widgets/RatingEntry.cs
index 0d251ba..e6a49ba 100644
--- a/Hyena.Gui/Hyena.Widgets/RatingEntry.cs
+++ b/Hyena.Gui/Hyena.Widgets/RatingEntry.cs
@@ -49,9 +49,7 @@ namespace Hyena.Widgets
 
         static RatingEntry ()
         {
-#if ENABLE_ATK
             RatingAccessibleFactory.Init ();
-#endif
         }
 
         public RatingEntry () : this (0)
@@ -391,7 +389,6 @@ namespace Hyena.Widgets
 
 #region Test Module
 
-#if ENABLE_ATK
     public class RatingAccessible : Atk.Object, Atk.Value, Atk.ValueImplementor
     {
         private RatingEntry rating;
@@ -440,9 +437,7 @@ namespace Hyena.Widgets
             return true;
         }
     }
-#endif
 
-#if ENABLE_ATK
     internal class RatingAccessibleFactory : Atk.ObjectFactory
     {
         public static void Init ()
@@ -461,7 +456,6 @@ namespace Hyena.Widgets
             return RatingAccessible.GType;
         }
     }
-#endif
 
     [Hyena.Gui.TestModule ("Rating Entry")]
     internal class RatingEntryTestModule : Gtk.Window
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 31291ba..6cb77cc 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -21,10 +21,6 @@ if ENABLE_TESTS
     ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
 endif
 
-if ENABLE_ATK
-    ENABLE_ATK_FLAG = "-define:ENABLE_ATK"
-endif
-
 FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
 DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
 
@@ -64,7 +60,7 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
 		-nowarn:0278 -nowarn:0078 $$warn \
 		-define:HAVE_GTK_2_10 -define:NET_2_0 \
 		-debug -target:$(TARGET) -out:$@ \
-		$(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(ENABLE_ATK_FLAG) \
+		$(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) \
 		$(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
 	@if [ -e $(srcdir)/$(notdir $  config) ]; then \
 		cp $(srcdir)/$(notdir $  config) $(top_builddir)/bin; \
diff --git a/configure.ac b/configure.ac
index c2d0eeb..fd1ccae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,12 +58,8 @@ SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
 ])
 
 dnl package checks, common for all configs
-PKG_CHECK_MODULES([GTKSHARP], [gtk-sharp-2.0])
-PKG_CHECK_MODULES([GLIBSHARP], [glib-sharp-2.0])
-
-dnl See if Gtk# is recent enought to enable managed widget a11y
-PKG_CHECK_MODULES(GTKSHARP_A11Y, gtk-sharp-2.0 >= 2.12.10, gtksharp_with_a11y=yes, gtksharp_with_a11y=no)
-AM_CONDITIONAL(ENABLE_ATK, test "x$gtksharp_with_a11y" = "xyes")
+PKG_CHECK_MODULES([GTKSHARP], gtk-sharp-2.0 >= 2.12.10)
+PKG_CHECK_MODULES([GLIBSHARP], glib-sharp-2.0)
 
 AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)
 AM_CONDITIONAL(HYENA_PKG_CONFIG, true)
@@ -115,7 +111,6 @@ cat <<EOF
 ${PACKAGE}-${VERSION}
 
 Unit Tests:        ${do_tests} (requires nunit >= ${NUNIT_REQUIRED})
-Custom a11y:       ${gtksharp_with_a11y} (requires gtk-sharp >= 2.12.10)
 
 EOF
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]