From: Paul Cornett <paulcor@bullseye.com>
Date: Fri, 20 Oct 2006 05:47:15 +0000 (+0000)
Subject: Remove unnecessary size members from GtkPizzaChild.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/91641d0443ae5ce3cb0d83f43aebc845af031318

Remove unnecessary size members from GtkPizzaChild.
Move some declarations out of header.


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

diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
index 6042e8837a..1bfeaa799e 100644
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -22,18 +22,7 @@ extern "C" {
 #define GTK_PIZZA(obj)          GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza)
 #define GTK_IS_PIZZA(obj)       GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())
 
-typedef struct _GtkPizzaChild    GtkPizzaChild;
 typedef struct _GtkPizza        GtkPizza;
-typedef struct _GtkPizzaClass   GtkPizzaClass;
-
-struct _GtkPizzaChild
-{
-    GtkWidget *widget;
-    gint x;
-    gint y;
-    gint width;
-    gint height;
-};
 
 struct _GtkPizza
 {
@@ -46,15 +35,6 @@ struct _GtkPizza
     GdkWindow *bin_window;
 };
 
-struct _GtkPizzaClass
-{
-  GtkContainerClass parent_class;
-
-  void  (*set_scroll_adjustments)   (GtkPizza     *pizza,
-                                     GtkAdjustment  *hadjustment,
-                                     GtkAdjustment  *vadjustment);
-};
-
 WXDLLIMPEXP_CORE
 GtkType    gtk_pizza_get_type        (void);
 WXDLLIMPEXP_CORE
diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index f793c468c5..09bd29432c 100644
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -20,8 +20,26 @@
 extern "C" {
 #endif /* __cplusplus */
 
+typedef struct _GtkPizzaChild GtkPizzaChild;
+typedef struct _GtkPizzaClass GtkPizzaClass;
 typedef struct _GtkPizzaAdjData  GtkPizzaAdjData;
 
+struct _GtkPizzaClass
+{
+  GtkContainerClass parent_class;
+
+  void  (*set_scroll_adjustments)   (GtkPizza     *pizza,
+                                     GtkAdjustment  *hadjustment,
+                                     GtkAdjustment  *vadjustment);
+};
+
+struct _GtkPizzaChild
+{
+    GtkWidget *widget;
+    gint x;
+    gint y;
+};
+
 struct _GtkPizzaAdjData
 {
     gint dx;
@@ -276,8 +294,6 @@ gtk_pizza_put (GtkPizza   *pizza,
     child_info->widget = widget;
     child_info->x = x;
     child_info->y = y;
-    child_info->width = width;
-    child_info->height = height;
 
     pizza->children = g_list_append (pizza->children, child_info);
 
@@ -324,16 +340,9 @@ gtk_pizza_set_size (GtkPizza   *pizza,
 
         if (child->widget == widget)
         {
-            if ((child->x == x) &&
-                (child->y == y) &&
-                (child->width == width) &&
-                (child->height == height)) return;
-
             child->x = x;
             child->y = y;
-            child->width = width;
-            child->height = height;
-            
+
             gtk_widget_set_size_request (widget, width, height);
 
             return;