X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf3dab485abd6ea29bcea0d4fdeca37edcefa508..5f9fd7ea86d211e3681a71c9f70303aa72b5de3c:/src/gtk/win_gtk.c diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index b420b7764b..44f804dc2d 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -18,6 +18,10 @@ extern "C" { #endif /* __cplusplus */ +#include +#include +#include + #define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \ (y >= G_MINSHORT) && (y <= G_MAXSHORT)) @@ -182,6 +186,9 @@ gtk_pizza_init (GtkPizza *pizza) pizza->height = 20; pizza->bin_window = NULL; + + pizza->xoffset = 0; + pizza->yoffset = 0; pizza->configure_serial = 0; pizza->scroll_x = 0; @@ -189,6 +196,7 @@ gtk_pizza_init (GtkPizza *pizza) pizza->visibility = GDK_VISIBILITY_PARTIAL; pizza->clear_on_draw = TRUE; + pizza->use_filter = FALSE; } GtkWidget* @@ -211,7 +219,7 @@ gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, void gtk_pizza_set_shadow_type (GtkPizza *pizza, - GtkMyShadowType type) + GtkMyShadowType type) { g_return_if_fail (pizza != NULL); g_return_if_fail (GTK_IS_PIZZA (pizza)); @@ -230,7 +238,7 @@ gtk_pizza_set_shadow_type (GtkPizza *pizza, void gtk_pizza_set_clear (GtkPizza *pizza, - gboolean clear) + gboolean clear) { g_return_if_fail (pizza != NULL); g_return_if_fail (GTK_IS_PIZZA (pizza)); @@ -238,6 +246,16 @@ gtk_pizza_set_clear (GtkPizza *pizza, pizza->clear_on_draw = clear; } +void +gtk_pizza_set_filter (GtkPizza *pizza, + gboolean use) +{ + g_return_if_fail (pizza != NULL); + g_return_if_fail (GTK_IS_PIZZA (pizza)); + + pizza->use_filter = use; +} + void gtk_pizza_put (GtkPizza *pizza, GtkWidget *widget, @@ -270,11 +288,14 @@ gtk_pizza_put (GtkPizza *pizza, if (!IS_ONSCREEN (x, y)) GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN); +/* if (GTK_WIDGET_REALIZED (pizza)) gtk_widget_realize (widget); +*/ gtk_widget_set_usize (widget, width, height); +/* if (GTK_WIDGET_VISIBLE (pizza) && GTK_WIDGET_VISIBLE (widget)) { if (GTK_WIDGET_MAPPED (pizza)) @@ -282,6 +303,7 @@ gtk_pizza_put (GtkPizza *pizza, gtk_widget_queue_resize (widget); } +*/ } void @@ -483,7 +505,7 @@ gtk_pizza_realize (GtkWidget *widget) GDK_VISIBILITY_NOTIFY_MASK; attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; - widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), + widget->window = gdk_window_new(gtk_widget_get_parent_window (widget), &attributes, attributes_mask); gdk_window_set_user_data (widget->window, widget); @@ -507,7 +529,7 @@ gtk_pizza_realize (GtkWidget *widget) GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK; - pizza->bin_window = gdk_window_new (widget->window, + pizza->bin_window = gdk_window_new(widget->window, &attributes, attributes_mask); gdk_window_set_user_data (pizza->bin_window, widget); @@ -679,14 +701,6 @@ gtk_pizza_expose (GtkWidget *widget, pizza = GTK_PIZZA (widget); -/* - if (event->window == widget->window) - { - gtk_pizza_draw_border( pizza ); - return FALSE; - } -*/ - if (event->window != pizza->bin_window) return FALSE; @@ -877,26 +891,28 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza, gint dx, gint dy) { - GList *tmp_list; - GtkPizzaAdjData data; + GList *tmp_list; + GtkPizzaAdjData data; - data.dx = dx; - data.dy = dy; + data.dx = dx; + data.dy = dy; - tmp_list = pizza->children; - while (tmp_list) + tmp_list = pizza->children; + while (tmp_list) { - GtkPizzaChild *child = tmp_list->data; - tmp_list = tmp_list->next; + GtkPizzaChild *child = tmp_list->data; + tmp_list = tmp_list->next; - child->widget->allocation.x += dx; - child->widget->allocation.y += dy; + child->widget->allocation.x += dx; + child->widget->allocation.y += dy; - if (GTK_WIDGET_NO_WINDOW (child->widget) && - GTK_IS_CONTAINER (child->widget)) - gtk_container_forall (GTK_CONTAINER (child->widget), - gtk_pizza_adjust_allocations_recurse, - &data); + if (GTK_WIDGET_NO_WINDOW (child->widget) && + GTK_IS_CONTAINER (child->widget)) + { + gtk_container_forall (GTK_CONTAINER (child->widget), + gtk_pizza_adjust_allocations_recurse, + &data); + } } } @@ -908,23 +924,23 @@ static void gtk_pizza_expose_area (GtkPizza *pizza, gint x, gint y, gint width, gint height) { - if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED) + if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED) { - GdkEventExpose event; + GdkEventExpose event; - event.type = GDK_EXPOSE; - event.send_event = TRUE; - event.window = pizza->bin_window; - event.count = 0; + event.type = GDK_EXPOSE; + event.send_event = TRUE; + event.window = pizza->bin_window; + event.count = 0; - event.area.x = x; - event.area.y = y; - event.area.width = width; - event.area.height = height; + event.area.x = x; + event.area.y = y; + event.area.width = width; + event.area.height = height; - gdk_window_ref (event.window); - gtk_widget_event (GTK_WIDGET (pizza), (GdkEvent *)&event); - gdk_window_unref (event.window); + gdk_window_ref (event.window); + gtk_widget_event (GTK_WIDGET (pizza), (GdkEvent *)&event); + gdk_window_unref (event.window); } } @@ -1139,12 +1155,13 @@ gtk_pizza_filter (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) { - XEvent *xevent; - GtkPizza *pizza; - - xevent = (XEvent *)gdk_xevent; - pizza = GTK_PIZZA (data); + XEvent *xevent; + GtkPizza *pizza; + xevent = (XEvent *)gdk_xevent; + + pizza = GTK_PIZZA (data); + switch (xevent->type) { case Expose: @@ -1172,7 +1189,7 @@ gtk_pizza_filter (GdkXEvent *gdk_xevent, break; } - return GDK_FILTER_CONTINUE; + return GDK_FILTER_CONTINUE; } /* Although GDK does have a GDK_VISIBILITY_NOTIFY event, @@ -1184,34 +1201,33 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) { - XEvent *xevent; - GtkPizza *pizza; + XEvent *xevent; + GtkPizza *pizza; - xevent = (XEvent *)gdk_xevent; - pizza = GTK_PIZZA (data); + xevent = (XEvent *)gdk_xevent; + pizza = GTK_PIZZA (data); - if (xevent->type == VisibilityNotify) + if (xevent->type == VisibilityNotify) { - switch (xevent->xvisibility.state) + switch (xevent->xvisibility.state) { - case VisibilityFullyObscured: - pizza->visibility = GDK_VISIBILITY_FULLY_OBSCURED; - break; + case VisibilityFullyObscured: + pizza->visibility = GDK_VISIBILITY_FULLY_OBSCURED; + break; - case VisibilityPartiallyObscured: - pizza->visibility = GDK_VISIBILITY_PARTIAL; - break; + case VisibilityPartiallyObscured: + pizza->visibility = GDK_VISIBILITY_PARTIAL; + break; - case VisibilityUnobscured: - pizza->visibility = GDK_VISIBILITY_UNOBSCURED; - break; + case VisibilityUnobscured: + pizza->visibility = GDK_VISIBILITY_UNOBSCURED; + break; } - - return GDK_FILTER_REMOVE; + + return GDK_FILTER_REMOVE; } - - return GDK_FILTER_CONTINUE; + return GDK_FILTER_CONTINUE; }