Deprecate widget flag: GTK_WIDGET_MAPPED

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

diff --git a/gtk/gtkwin32embedwidget.c b/gtk/gtkwin32embedwidget.c
index ac43aaa91797356038e0b8c734e61ea28699c6a2..1c28eb4fe242f34093c4aa97614871554d83cb63 100644 (file)
--- a/gtk/gtkwin32embedwidget.c
+++ b/gtk/gtkwin32embedwidget.c
@@ -23,7 +23,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
@@ -128,11 +128,7 @@ _gtk_win32_embed_widget_dialog_procedure (GtkWin32EmbedWidget *embed_widget,
 static void
 gtk_win32_embed_widget_unrealize (GtkWidget *widget)
 {
-  GtkWin32EmbedWidget *embed_widget;
-
-  g_return_if_fail (GTK_IS_WIN32_EMBED_WIDGET (widget));
-
-  embed_widget = GTK_WIN32_EMBED_WIDGET (widget);
+  GtkWin32EmbedWidget *embed_widget = GTK_WIN32_EMBED_WIDGET (widget);
 
   embed_widget->old_window_procedure = NULL;
   
@@ -142,9 +138,8 @@ gtk_win32_embed_widget_unrealize (GtkWidget *widget)
       g_object_unref (embed_widget->parent_window);
       embed_widget->parent_window = NULL;
     }
-  
-  if (GTK_WIDGET_CLASS (gtk_win32_embed_widget_parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (gtk_win32_embed_widget_parent_class)->unrealize) (widget);
+
+  GTK_WIDGET_CLASS (gtk_win32_embed_widget_parent_class)->unrealize (widget);
 }
 
 static LRESULT CALLBACK
@@ -176,17 +171,12 @@ gtk_win32_embed_widget_window_process (HWND hwnd, UINT msg, WPARAM wparam, LPARA
 static void
 gtk_win32_embed_widget_realize (GtkWidget *widget)
 {
-  GtkWindow *window;
-  GtkWin32EmbedWidget *embed_widget;
+  GtkWindow *window = GTK_WINDOW (widget);
+  GtkWin32EmbedWidget *embed_widget = GTK_WIN32_EMBED_WIDGET (widget);
   GdkWindowAttr attributes;
   gint attributes_mask;
   LONG_PTR styles;
 
-  g_return_if_fail (GTK_IS_WIN32_EMBED_WIDGET (widget));
-
-  window = GTK_WINDOW (widget);
-  embed_widget = GTK_WIN32_EMBED_WIDGET (widget);
-  
   /* ensure widget tree is properly size allocated */
   if (widget->allocation.x == -1 &&
       widget->allocation.y == -1 &&
@@ -280,8 +270,8 @@ gtk_win32_embed_widget_map (GtkWidget *widget)
   GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
   
   if (bin->child &&
-      GTK_WIDGET_VISIBLE (bin->child) &&
-      !GTK_WIDGET_MAPPED (bin->child))
+      gtk_widget_get_visible (bin->child) &&
+      !gtk_widget_get_mapped (bin->child))
     gtk_widget_map (bin->child);
 
   gdk_window_show (widget->window);
@@ -307,7 +297,7 @@ gtk_win32_embed_widget_size_allocate (GtkWidget     *widget,
                            allocation->x, allocation->y,
                            allocation->width, allocation->height);
   
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     {
       GtkAllocation child_allocation;