X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db71eb0640221199170ac9ea83371c2d467fa456..38aa6e420c1dde8dc8c2a6512a314328bcf8a28f:/src/gtk/win_gtk.c diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index 31a826d1dd..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; @@ -40,8 +58,6 @@ static void gtk_pizza_size_request (GtkWidget *widget, GtkRequisition *requisition); static void gtk_pizza_size_allocate (GtkWidget *widget, GtkAllocation *allocation); -static gint gtk_pizza_expose (GtkWidget *widget, - GdkEventExpose *event); static void gtk_pizza_style_set (GtkWidget *widget, GtkStyle *previous_style); static void gtk_pizza_add (GtkContainer *container, @@ -148,7 +164,6 @@ gtk_pizza_class_init (GtkPizzaClass *klass) widget_class->unrealize = gtk_pizza_unrealize; widget_class->size_request = gtk_pizza_size_request; widget_class->size_allocate = gtk_pizza_size_allocate; - widget_class->expose_event = gtk_pizza_expose; widget_class->style_set = gtk_pizza_style_set; container_class->add = gtk_pizza_add; @@ -185,8 +200,6 @@ gtk_pizza_init (GtkPizza *pizza) { GTK_WIDGET_UNSET_FLAGS (pizza, GTK_NO_WINDOW); - pizza->shadow_type = GTK_MYSHADOW_NONE; - pizza->children = NULL; pizza->bin_window = NULL; @@ -241,16 +254,16 @@ void gtk_pizza_set_yoffset (GtkPizza *pizza, gint yoffset) gint gtk_pizza_get_rtl_offset (GtkPizza *pizza) { - gint width; + gint border; g_return_val_if_fail ( (pizza != NULL), 0 ); g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), 0 ); if (!pizza->bin_window) return 0; - gdk_window_get_geometry( pizza->bin_window, NULL, NULL, &width, NULL, NULL ); - - return width; + border = pizza->container.border_width; + + return GTK_WIDGET(pizza)->allocation.width - border*2; } @@ -262,25 +275,6 @@ gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, /* We handle scrolling in the wxScrolledWindow, not here. */ } -void -gtk_pizza_set_shadow_type (GtkPizza *pizza, - GtkMyShadowType type) -{ - g_return_if_fail (pizza != NULL); - g_return_if_fail (GTK_IS_PIZZA (pizza)); - - if (pizza->shadow_type != type) - { - pizza->shadow_type = type; - - if (GTK_WIDGET_VISIBLE (pizza)) - { - gtk_widget_size_allocate (GTK_WIDGET (pizza), &(GTK_WIDGET (pizza)->allocation)); - gtk_widget_queue_draw (GTK_WIDGET (pizza)); - } - } -} - void gtk_pizza_put (GtkPizza *pizza, GtkWidget *widget, @@ -295,28 +289,22 @@ gtk_pizza_put (GtkPizza *pizza, g_return_if_fail (GTK_IS_PIZZA (pizza)); g_return_if_fail (widget != NULL); - if (gtk_widget_get_direction( GTK_WIDGET(pizza) ) == GTK_TEXT_DIR_RTL) - { - /* reverse horizontal placement */ - x = GTK_WIDGET(pizza)->allocation.width - x - width; - } - child_info = g_new (GtkPizzaChild, 1); 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); if (GTK_WIDGET_REALIZED (pizza)) - gtk_widget_set_parent_window (widget, pizza->bin_window); + gtk_widget_set_parent_window (widget, pizza->bin_window); gtk_widget_set_parent (widget, GTK_WIDGET (pizza)); - gtk_widget_set_size_request (widget, width, height); + gtk_widget_set_size_request( widget, width, height ); + if (GTK_WIDGET_REALIZED (pizza)) + gtk_pizza_allocate_child (pizza, child_info); } void @@ -352,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; @@ -407,6 +388,7 @@ gtk_pizza_realize (GtkWidget *widget) gint attributes_mask; GtkPizzaChild *child; GList *children; + int border; g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_PIZZA (widget)); @@ -421,29 +403,11 @@ gtk_pizza_realize (GtkWidget *widget) attributes.width = widget->allocation.width; attributes.height = widget->allocation.height; -#ifndef __WXUNIVERSAL__ - if (pizza->shadow_type == GTK_MYSHADOW_NONE) - { - /* no border, no changes to sizes */ - } - else if (pizza->shadow_type == GTK_MYSHADOW_THIN) - { - /* GTK_MYSHADOW_THIN == wxSIMPLE_BORDER */ - attributes.x += 1; - attributes.y += 1; - attributes.width -= 2; - attributes.height -= 2; - } - else - { - /* GTK_MYSHADOW_IN == wxSUNKEN_BORDER */ - /* GTK_MYSHADOW_OUT == wxRAISED_BORDER */ - attributes.x += 2; - attributes.y += 2; - attributes.width -= 4; - attributes.height -= 4; - } -#endif /* __WXUNIVERSAL__ */ + border = pizza->container.border_width; + attributes.x += border; + attributes.y += border; + attributes.width -= 2 * border; + attributes.height -= 2 * border; /* minimal size */ if (attributes.width < 2) attributes.width = 2; @@ -575,14 +539,8 @@ gtk_pizza_size_allocate (GtkWidget *widget, (widget->allocation.y == allocation->y)); widget->allocation = *allocation; - if (pizza->shadow_type == GTK_MYSHADOW_NONE) - border = 0; - else - if (pizza->shadow_type == GTK_MYSHADOW_THIN) - border = 1; - else - border = 2; - + border = pizza->container.border_width; + x = allocation->x + border; y = allocation->y + border; w = allocation->width - border*2; @@ -598,7 +556,7 @@ gtk_pizza_size_allocate (GtkWidget *widget, gdk_window_resize( widget->window, w, h ); else gdk_window_move_resize( widget->window, x, y, w, h ); - + gdk_window_resize( pizza->bin_window, w, h ); } @@ -612,26 +570,6 @@ gtk_pizza_size_allocate (GtkWidget *widget, } } -static gint -gtk_pizza_expose (GtkWidget *widget, - GdkEventExpose *event) -{ - GtkPizza *pizza; - - g_return_val_if_fail (widget != NULL, FALSE); - g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); - - pizza = (GtkPizza*)widget; - - if (event->window != pizza->bin_window) - return FALSE; - - pizza_parent_class->expose_event(widget, event); - - return FALSE; -} - static void gtk_pizza_style_set(GtkWidget *widget, GtkStyle *previous_style) { @@ -737,8 +675,13 @@ gtk_pizza_allocate_child (GtkPizza *pizza, if (gtk_widget_get_direction( GTK_WIDGET(pizza) ) == GTK_TEXT_DIR_RTL) { /* reverse horizontal placement */ - printf( "alloc width %d\n", GTK_WIDGET(pizza)->allocation.width ); - allocation.x = GTK_WIDGET(pizza)->allocation.width - child->x - allocation.width - pizza->m_xoffset; + gint offset,border; + + offset = GTK_WIDGET(pizza)->allocation.width; + border = pizza->container.border_width; + offset -= border*2; + + allocation.x = offset - child->x - allocation.width + pizza->m_xoffset; } gtk_widget_size_allocate (child->widget, &allocation);