Deprecate widget flag: GTK_WIDGET_MAPPED

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

diff --git a/gtk/gtkwin32embedwidget.c b/gtk/gtkwin32embedwidget.c
index 4d48311895e2190deb64da18e9c94120dfd12570..1c28eb4fe242f34093c4aa97614871554d83cb63 100644 (file)
--- a/gtk/gtkwin32embedwidget.c
+++ b/gtk/gtkwin32embedwidget.c
@@ -138,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
@@ -271,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);
@@ -298,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;