gtk_pizza_set_external is redundant

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
index a62ed2d8417691fbabba9d89c44e1c03624bf86b..0340f05dfd4335b0366ddd7a4b06c23a91d86ff5 100644 (file)
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -56,8 +56,6 @@ struct _GtkPizza
     gint  m_width;
 
     GdkWindow *bin_window;
     gint  m_width;
 
     GdkWindow *bin_window;

-
-    gboolean external_expose;

 };
 
 struct _GtkPizzaClass
 };
 
 struct _GtkPizzaClass


@@ -93,10 +91,6 @@ WXDLLIMPEXP_CORE
 void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
                                       GtkMyShadowType    type);
 
 void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
                                       GtkMyShadowType    type);
 

-WXDLLIMPEXP_CORE
-void       gtk_pizza_set_external    (GtkPizza          *pizza,
-                                      gboolean           expose);
-

 WXDLLIMPEXP_CORE
 void       gtk_pizza_scroll          (GtkPizza          *pizza,
                                       gint               dx,
 WXDLLIMPEXP_CORE
 void       gtk_pizza_scroll          (GtkPizza          *pizza,
                                       gint               dx,

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 12ccb9b591a6135221dcc3c5b731302925d57399..6115bc3a337fcddfcf8be76bc824937639ad8c49 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -64,8 +64,7 @@ static void  gtk_pizza_scroll_set_adjustments (GtkPizza      *pizza,
                                                GtkAdjustment *hadj,
                                                GtkAdjustment *vadj);
 
                                                GtkAdjustment *hadj,
                                                GtkAdjustment *vadj);
 

-/* static */
-GtkContainerClass *pizza_parent_class = NULL;
+static GtkWidgetClass* pizza_parent_class;

 
 GtkType
 gtk_pizza_get_type ()
 
 GtkType
 gtk_pizza_get_type ()


@@ -195,8 +194,6 @@ gtk_pizza_init (GtkPizza *pizza)
     pizza->m_yoffset = 0;
     
     pizza->m_width = -1;
     pizza->m_yoffset = 0;
     
     pizza->m_width = -1;

-
-    pizza->external_expose = FALSE;

 }
 
 GtkWidget*
 }
 
 GtkWidget*


@@ -285,16 +282,6 @@ gtk_pizza_set_shadow_type (GtkPizza        *pizza,
     }
 }
 
     }
 }
 

-void
-gtk_pizza_set_external (GtkPizza  *pizza,
-                        gboolean   expose)
-{
-    g_return_if_fail (pizza != NULL);
-    g_return_if_fail (GTK_IS_PIZZA (pizza));
-
-    pizza->external_expose = expose;
-}
-

 void
 gtk_pizza_put (GtkPizza   *pizza,
                GtkWidget  *widget,
 void
 gtk_pizza_put (GtkPizza   *pizza,
                GtkWidget  *widget,


@@ -544,8 +531,8 @@ gtk_pizza_unrealize (GtkWidget *widget)
     gdk_window_destroy (pizza->bin_window);
     pizza->bin_window = NULL;
 
     gdk_window_destroy (pizza->bin_window);
     pizza->bin_window = NULL;
 

-    if (GTK_WIDGET_CLASS (pizza_parent_class)->unrealize)
-       (* GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) (widget);
+    if (pizza_parent_class->unrealize)
+        pizza_parent_class->unrealize(widget);

 }
 
 static void
 }
 
 static void


@@ -642,16 +629,12 @@ gtk_pizza_expose (GtkWidget      *widget,
     g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE);
     g_return_val_if_fail (event != NULL, FALSE);
 
     g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE);
     g_return_val_if_fail (event != NULL, FALSE);
 

-    pizza = GTK_PIZZA (widget);
+    pizza = (GtkPizza*)widget;

 
     if (event->window != pizza->bin_window)
         return FALSE;
 
 
     if (event->window != pizza->bin_window)
         return FALSE;
 

-    /* We handle all expose events in window.cpp now. */
-    if (pizza->external_expose)
-        return FALSE;
-
-    (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, event);
+    pizza_parent_class->expose_event(widget, event);

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -665,7 +648,7 @@ gtk_pizza_style_set(GtkWidget *widget, GtkStyle  *previous_style)
         gtk_style_set_background(widget->style, GTK_PIZZA(widget)->bin_window, GTK_STATE_NORMAL );
     }
 
         gtk_style_set_background(widget->style, GTK_PIZZA(widget)->bin_window, GTK_STATE_NORMAL );
     }
 

-    (* GTK_WIDGET_CLASS (pizza_parent_class)->style_set) (widget, previous_style);
+    pizza_parent_class->style_set(widget, previous_style);

 }
 
 static void
 }
 
 static void

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 081370a010c5b50db578819aeb7f0e383d94b1b0..3d6fb6f937e8c59e9c936221298aa4bcdbdb9324 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -78,8 +78,6 @@
     #undef HAVE_XIM
 #endif
 
     #undef HAVE_XIM
 #endif
 

-extern GtkContainerClass *pizza_parent_class;
-

 //-----------------------------------------------------------------------------
 // documentation on internals
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // documentation on internals
 //-----------------------------------------------------------------------------


@@ -513,8 +511,6 @@ gtk_window_expose_callback( GtkWidget *widget,
     win->GtkSendPaintEvents();
 
     // Let parent window draw window-less widgets
     win->GtkSendPaintEvents();
 
     // Let parent window draw window-less widgets

-    (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, gdk_event);
-

     return FALSE;
 }
 }
     return FALSE;
 }
 }


@@ -2604,8 +2600,6 @@ void wxWindowGTK::PostCreation()
         {
             // these get reported to wxWidgets -> wxPaintEvent
 
         {
             // these get reported to wxWidgets -> wxPaintEvent
 

-            gtk_pizza_set_external( GTK_PIZZA(m_wxwindow), TRUE );
-

             g_signal_connect (m_wxwindow, "expose_event",
                               G_CALLBACK (gtk_window_expose_callback), this);
 
             g_signal_connect (m_wxwindow, "expose_event",
                               G_CALLBACK (gtk_window_expose_callback), this);