Revert "combobox: Don't special-case RTL child positions anymore"

[~andy/gtk] / gtk / gtkseparatormenuitem.c

diff --git a/gtk/gtkseparatormenuitem.c b/gtk/gtkseparatormenuitem.c
index 96f21198425484434a89e765b516b37e9dea5a24..da721297067eac0f0572bc7c821fdedf2e9c58d2 100644 (file)
--- a/gtk/gtkseparatormenuitem.c
+++ b/gtk/gtkseparatormenuitem.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -25,9 +23,11 @@
  */
 
 #include "config.h"
-#include "gtkaccessibleprivate.h"
+
 #include "gtkseparatormenuitem.h"
 
+#include "gtkstylecontext.h"
+
 /**
  * SECTION:gtkseparatormenuitem
  * @Short_description: A separator used in menus
@@ -38,20 +38,23 @@
  * make it appear sunken into the interface.
  */
 
-static AtkObject *gtk_separator_menu_item_get_accessible (GtkWidget *widget);
-
 G_DEFINE_TYPE (GtkSeparatorMenuItem, gtk_separator_menu_item, GTK_TYPE_MENU_ITEM)
 
 static void
 gtk_separator_menu_item_class_init (GtkSeparatorMenuItemClass *class)
 {
   GTK_CONTAINER_CLASS (class)->child_type = NULL;
-  GTK_WIDGET_CLASS (class)->get_accessible = gtk_separator_menu_item_get_accessible;
+
+  gtk_widget_class_set_accessible_role (GTK_WIDGET_CLASS (class), ATK_ROLE_SEPARATOR);
 }
 
 static void 
 gtk_separator_menu_item_init (GtkSeparatorMenuItem *item)
 {
+  GtkStyleContext *context;
+
+  context = gtk_widget_get_style_context (GTK_WIDGET (item));
+  gtk_style_context_add_class (context, GTK_STYLE_CLASS_SEPARATOR);
 }
 
 /**
@@ -66,82 +69,3 @@ gtk_separator_menu_item_new (void)
 {
   return g_object_new (GTK_TYPE_SEPARATOR_MENU_ITEM, NULL);
 }
-
-typedef struct _GtkSeparatorMenuItemAccessible GtkSeparatorMenuItemAccessible;
-typedef struct _GtkSeparatorMenuItemAccessibleClass GtkSeparatorMenuItemAccessibleClass;
-
-ATK_DEFINE_TYPE (GtkSeparatorMenuItemAccessible, _gtk_separator_menu_item_accessible, GTK_TYPE_MENU_ITEM);
-
-static void
-_gtk_separator_menu_item_accessible_initialize (AtkObject *accessible,
-                                                gpointer   widget)
-{
-  ATK_OBJECT_CLASS (_gtk_separator_menu_item_accessible_parent_class)->initialize (accessible, widget);
-
-  atk_object_set_role (accessible, ATK_ROLE_SEPARATOR);
-}
-
-static void
-_gtk_separator_menu_item_accessible_class_init (GtkSeparatorMenuItemAccessibleClass *klass)
-{
-  AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
-
-  atk_class->initialize = _gtk_separator_menu_item_accessible_initialize;
-}
-
-static void
-_gtk_separator_menu_item_accessible_init (GtkSeparatorMenuItemAccessible *self)
-{
-}
-
-typedef AtkObjectFactoryClass   GtkSeparatorMenuItemAccessibleFactoryClass;
-typedef AtkObjectFactory        GtkSeparatorMenuItemAccessibleFactory;
-
-G_DEFINE_TYPE (GtkSeparatorMenuItemAccessibleFactory,
-               gtk_separator_menu_item_accessible_factory,
-               ATK_TYPE_OBJECT_FACTORY);
-
-static GType
-gtk_separator_menu_item_accessible_factory_get_accessible_type (void)
-{
-  return _gtk_separator_menu_item_accessible_get_type ();
-}
-
-static AtkObject *
-gtk_separator_menu_item_accessible_factory_create_accessible (GObject *obj)
-{
-  AtkObject *accessible;
-
-  accessible = g_object_new (_gtk_separator_menu_item_accessible_get_type (), NULL);
-  atk_object_initialize (accessible, obj);
-
-  return accessible;
-}
-
-static void
-gtk_separator_menu_item_accessible_factory_class_init (AtkObjectFactoryClass *klass)
-{
-  klass->create_accessible = gtk_separator_menu_item_accessible_factory_create_accessible;
-  klass->get_accessible_type = gtk_separator_menu_item_accessible_factory_get_accessible_type;
-}
-
-static void
-gtk_separator_menu_item_accessible_factory_init (AtkObjectFactory *factory)
-{
-}
-
-static AtkObject *
-gtk_separator_menu_item_get_accessible (GtkWidget *widget)
-{
-  static gboolean initialized = FALSE
-
-  if (G_UNLIKELY (!initialized))
-    {
-      _gtk_accessible_set_factory_type (GTK_TYPE_SEPARATOR_MENU_ITEM,
-                                        gtk_separator_menu_item_accessible_factory_get_type ());
-
-      initialized = TRUE;
-    }
-
-  return GTK_WIDGET_CLASS (gtk_separator_menu_item_parent_class)->get_accessible (widget);
-}