Deprecate flag macros for toplevel, state, no window and composite child

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

diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index d36816c265f0edebe86706bab854e6789f1342e1..74d05547fd3db41ad99cdb01b7709f6f7027b9e2 100644 (file)
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -24,17 +24,18 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include <config.h>
-#include "gtkintl.h"
-#include "gtkmenu.h"
-#include "gtkmenuitem.h"
-#include "gtkmarshalers.h"
+#include "config.h"
+
 #include "gdk/gdkkeysyms.h"
 
 #undef GTK_DISABLE_DEPRECATED
-#include "gtkoptionmenu.h"
 
+#include "gtkmenu.h"
+#include "gtkmenuitem.h"
+#include "gtkmarshalers.h"
+#include "gtkoptionmenu.h"
 #include "gtkprivate.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 #define CHILD_LEFT_SPACING        4
@@ -252,7 +253,7 @@ gtk_option_menu_set_menu (GtkOptionMenu *option_menu,
       g_signal_connect_after (option_menu->menu, "selection-done",
                              G_CALLBACK (gtk_option_menu_selection_done),
                              option_menu);
-      g_signal_connect_swapped (option_menu->menu, "size_request",
+      g_signal_connect_swapped (option_menu->menu, "size-request",
                                G_CALLBACK (gtk_option_menu_calc_size),
                                option_menu);
 
@@ -376,8 +377,7 @@ gtk_option_menu_destroy (GtkObject *object)
   if (option_menu->menu)
     gtk_widget_destroy (option_menu->menu);
 
-  if (GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy (object);
 }
 
 static void
@@ -608,7 +608,7 @@ gtk_option_menu_expose (GtkWidget      *widget,
 
       child_event = *event;
 
-      if (GTK_WIDGET_NO_WINDOW (child) &&
+      if (!gtk_widget_get_has_window (child) &&
          gtk_widget_intersect (child, &event->area, &child_event.area))
        gtk_widget_event (child, (GdkEvent*) &child_event);
 
@@ -776,7 +776,7 @@ gtk_option_menu_update_contents (GtkOptionMenu *option_menu)
              gtk_widget_reparent (child, GTK_WIDGET (option_menu));
            }
 
-         g_signal_connect (option_menu->menu_item, "state_changed",
+         g_signal_connect (option_menu->menu_item, "state-changed",
                            G_CALLBACK (gtk_option_menu_item_state_changed_cb), option_menu);
          g_signal_connect (option_menu->menu_item, "destroy",
                            G_CALLBACK (gtk_option_menu_item_destroy_cb), option_menu);
@@ -895,7 +895,7 @@ gtk_option_menu_position (GtkMenu  *menu,
   gdk_window_get_origin (widget->window, &menu_xpos, &menu_ypos);
 
   /* set combo box type hint for menu popup */
-  gtk_window_set_type_hint (GTK_MENU (option_menu->menu)->toplevel,
+  gtk_window_set_type_hint (GTK_WINDOW (GTK_MENU (option_menu->menu)->toplevel),
                            GDK_WINDOW_TYPE_HINT_COMBO);
 
   menu_xpos += widget->allocation.x;