clip column image (and not only the text) to the column width (patch 1664588)

[wxWidgets.git] / src / gtk / win_gtk.c

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index f793c468c5244ef0febfe0b8c2002c1d0f53dff2..dcc0e1defd5366b1321c1aa50364ea3b5f9dc277 100644 (file)
--- 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;
@@ -71,7 +89,7 @@ gtk_pizza_get_type ()
 
     if (!pizza_type)
     {
-        static const GTypeInfo pizza_info =
+        const GTypeInfo pizza_info =
         {
             sizeof (GtkPizzaClass),
             NULL,           /* base_init */
@@ -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,13 @@ 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;
-            
+            if (child->x != x || child->y != y)
+            {
+                child->x = x;
+                child->y = y;
+                gtk_widget_queue_resize(widget);
+            }
+
             gtk_widget_set_size_request (widget, width, height);
 
             return;