X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/693460233749fec3bf79720268d3cd8dfc55c78d..f1d6804f7c1a398dd0616ccf15cb0f96ea07f5e0:/src/gtk/win_gtk.c diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index ead5ad20d6..f793c468c5 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -40,8 +40,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, @@ -64,8 +62,7 @@ static void gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, GtkAdjustment *hadj, GtkAdjustment *vadj); -/* static */ -GtkContainerClass *pizza_parent_class = NULL; +static GtkWidgetClass* pizza_parent_class; GtkType gtk_pizza_get_type () @@ -85,6 +82,7 @@ gtk_pizza_get_type () sizeof (GtkPizza), 16, /* n_preallocs */ (GInstanceInitFunc) gtk_pizza_init, + NULL }; pizza_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPizza", &pizza_info, (GTypeFlags)0); } @@ -148,7 +146,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,22 +182,12 @@ gtk_pizza_init (GtkPizza *pizza) { GTK_WIDGET_UNSET_FLAGS (pizza, GTK_NO_WINDOW); - pizza->shadow_type = GTK_MYSHADOW_NONE; - pizza->children = NULL; - pizza->width = 20; - pizza->height = 20; - pizza->bin_window = NULL; - pizza->xoffset = 0; - pizza->yoffset = 0; - - pizza->scroll_x = 0; - pizza->scroll_y = 0; - - pizza->external_expose = FALSE; + pizza->m_xoffset = 0; + pizza->m_yoffset = 0; } GtkWidget* @@ -213,41 +200,61 @@ gtk_pizza_new () return GTK_WIDGET (pizza); } -static void -gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, - GtkAdjustment *hadj, - GtkAdjustment *vadj) +gint gtk_pizza_get_xoffset (GtkPizza *pizza) { - /* We handle scrolling in the wxScrolledWindow, not here. */ + g_return_val_if_fail ( (pizza != NULL), -1 ); + g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), -1 ); + + return pizza->m_xoffset; } -void -gtk_pizza_set_shadow_type (GtkPizza *pizza, - GtkMyShadowType type) +gint gtk_pizza_get_yoffset (GtkPizza *pizza) +{ + g_return_val_if_fail ( (pizza != NULL), -1 ); + g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), -1 ); + + return pizza->m_yoffset; +} + +void gtk_pizza_set_xoffset (GtkPizza *pizza, gint xoffset) { 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)); - } - } + pizza->m_xoffset = xoffset; + // do something } -void -gtk_pizza_set_external (GtkPizza *pizza, - gboolean expose) +void gtk_pizza_set_yoffset (GtkPizza *pizza, gint yoffset) { g_return_if_fail (pizza != NULL); g_return_if_fail (GTK_IS_PIZZA (pizza)); - pizza->external_expose = expose; + pizza->m_xoffset = yoffset; + // do something +} + +gint gtk_pizza_get_rtl_offset (GtkPizza *pizza) +{ + 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; + + border = pizza->container.border_width; + + return GTK_WIDGET(pizza)->allocation.width - border*2; +} + + +static void +gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, + GtkAdjustment *hadj, + GtkAdjustment *vadj) +{ + /* We handle scrolling in the wxScrolledWindow, not here. */ } void @@ -275,11 +282,13 @@ gtk_pizza_put (GtkPizza *pizza, 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 @@ -324,7 +333,7 @@ gtk_pizza_set_size (GtkPizza *pizza, child->y = y; child->width = width; child->height = height; - + gtk_widget_set_size_request (widget, width, height); return; @@ -370,6 +379,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)); @@ -384,29 +394,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; @@ -480,8 +472,8 @@ gtk_pizza_unrealize (GtkWidget *widget) 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 @@ -526,6 +518,7 @@ gtk_pizza_size_allocate (GtkWidget *widget, gint x,y,w,h; GtkPizzaChild *child; GList *children; + gboolean only_resize; g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_PIZZA(widget)); @@ -533,16 +526,12 @@ gtk_pizza_size_allocate (GtkWidget *widget, pizza = GTK_PIZZA (widget); + only_resize = ((widget->allocation.x == allocation->x) && + (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; @@ -554,8 +543,12 @@ gtk_pizza_size_allocate (GtkWidget *widget, if (GTK_WIDGET_REALIZED (widget)) { - gdk_window_move_resize( widget->window, x, y, w, h ); - gdk_window_move_resize( pizza->bin_window, 0, 0, w, h ); + if (only_resize) + 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 ); } children = pizza->children; @@ -568,30 +561,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 = GTK_PIZZA (widget); - - 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); - - return FALSE; -} - static void gtk_pizza_style_set(GtkWidget *widget, GtkStyle *previous_style) { @@ -601,7 +570,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_WIDGET_CLASS (pizza_parent_class)->style_set) (widget, previous_style); + pizza_parent_class->style_set(widget, previous_style); } static void @@ -688,12 +657,24 @@ gtk_pizza_allocate_child (GtkPizza *pizza, GtkAllocation allocation; GtkRequisition requisition; - allocation.x = child->x - pizza->xoffset; - allocation.y = child->y - pizza->yoffset; + allocation.x = child->x - pizza->m_xoffset; + allocation.y = child->y - pizza->m_yoffset; gtk_widget_get_child_requisition (child->widget, &requisition); allocation.width = requisition.width; allocation.height = requisition.height; + if (gtk_widget_get_direction( GTK_WIDGET(pizza) ) == GTK_TEXT_DIR_RTL) + { + /* reverse horizontal placement */ + 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); } @@ -747,8 +728,8 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza, void gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) { - pizza->xoffset += dx; - pizza->yoffset += dy; + pizza->m_xoffset += dx; + pizza->m_yoffset += dy; gtk_pizza_adjust_allocations (pizza, -dx, -dy);