X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e5a4c69c540b430fba8efe5dae1bc1ffd5caeca..fc2d42090058bb7ebb9545b857a9a435ecbdd876:/src/gtk1/win_gtk.c diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c index e2845ae082..c14edde8c7 100644 --- a/src/gtk1/win_gtk.c +++ b/src/gtk1/win_gtk.c @@ -1,20 +1,20 @@ /* /////////////////////////////////////////////////////////////////////////// -// Name: win_gtk.c -// Purpose: Native GTK+ widget for wxWindows, based on GtkLayout and +// Name: src/gtk1/win_gtk.c +// Purpose: Native GTK+ widget for wxWidgets, based on GtkLayout and // GtkFixed. It makes use of the gravity window property and // therefore does not work with GTK 1.0. // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////// */ #ifdef VMS #define XCheckIfEvent XCHECKIFEVENT #endif -#include "wx/setup.h" -#include "wx/gtk/win_gtk.h" +#include "wx/platform.h" +#include "wx/gtk1/win_gtk.h" #include "gtk/gtksignal.h" #include "gtk/gtkprivate.h" #include "gdk/gdkx.h" @@ -30,6 +30,7 @@ extern "C" { #define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \ (y >= G_MINSHORT) && (y <= G_MAXSHORT)) + typedef struct _GtkPizzaAdjData GtkPizzaAdjData; struct _GtkPizzaAdjData @@ -50,12 +51,12 @@ static void gtk_pizza_size_request (GtkWidget *widget, GtkRequisition *requisition); static void gtk_pizza_size_allocate (GtkWidget *widget, GtkAllocation *allocation); -#ifndef __WXGTK20__ static void gtk_pizza_draw (GtkWidget *widget, GdkRectangle *area); -#endif /* __WXGTK20__ */ 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, GtkWidget *widget); static void gtk_pizza_remove (GtkContainer *container, @@ -65,29 +66,14 @@ static void gtk_pizza_forall (GtkContainer *container, GtkCallback callback, gpointer callback_data); -static void gtk_pizza_position_child (GtkPizza *pizza, - GtkPizzaChild *child); static void gtk_pizza_allocate_child (GtkPizza *pizza, GtkPizzaChild *child); -static void gtk_pizza_position_children (GtkPizza *pizza); - static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget, gpointer cb_data); -static void gtk_pizza_adjust_allocations (GtkPizza *pizza, - gint dx, - gint dy); - - -/* unused */ -#if 0 -static void gtk_pizza_expose_area (GtkPizza *pizza, - gint x, - gint y, - gint width, - gint height); -static void gtk_pizza_adjustment_changed (GtkAdjustment *adjustment, - GtkPizza *pizza); -#endif + +static void gtk_pizza_position_child (GtkPizza *pizza, + GtkPizzaChild *child); +static void gtk_pizza_position_children (GtkPizza *pizza); static GdkFilterReturn gtk_pizza_filter (GdkXEvent *gdk_xevent, GdkEvent *event, @@ -96,7 +82,6 @@ static GdkFilterReturn gtk_pizza_main_filter (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data); - static GtkType gtk_pizza_child_type (GtkContainer *container); static void gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, @@ -104,26 +89,27 @@ static void gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, GtkAdjustment *vadj); -static GtkContainerClass *parent_class = NULL; +static GtkContainerClass *pizza_parent_class = NULL; + static gboolean gravity_works; -guint +GtkType gtk_pizza_get_type () { - static guint pizza_type = 0; + static GtkType pizza_type = 0; if (!pizza_type) { GtkTypeInfo pizza_info = { - "GtkPizza", - sizeof (GtkPizza), - sizeof (GtkPizzaClass), - (GtkClassInitFunc) gtk_pizza_class_init, - (GtkObjectInitFunc) gtk_pizza_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, + "GtkPizza", + sizeof (GtkPizza), + sizeof (GtkPizzaClass), + (GtkClassInitFunc) gtk_pizza_class_init, + (GtkObjectInitFunc) gtk_pizza_init, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, + (GtkClassInitFunc) NULL, }; pizza_type = gtk_type_unique (gtk_container_get_type (), &pizza_info); } @@ -141,17 +127,16 @@ gtk_pizza_class_init (GtkPizzaClass *klass) object_class = (GtkObjectClass*) klass; widget_class = (GtkWidgetClass*) klass; container_class = (GtkContainerClass*) klass; - parent_class = gtk_type_class (GTK_TYPE_CONTAINER); + pizza_parent_class = gtk_type_class (GTK_TYPE_CONTAINER); widget_class->map = gtk_pizza_map; widget_class->realize = gtk_pizza_realize; widget_class->unrealize = gtk_pizza_unrealize; widget_class->size_request = gtk_pizza_size_request; widget_class->size_allocate = gtk_pizza_size_allocate; -#ifndef __WXGTK20__ widget_class->draw = gtk_pizza_draw; -#endif widget_class->expose_event = gtk_pizza_expose; + widget_class->style_set = gtk_pizza_style_set; container_class->add = gtk_pizza_add; container_class->remove = gtk_pizza_remove; @@ -164,11 +149,7 @@ gtk_pizza_class_init (GtkPizzaClass *klass) widget_class->set_scroll_adjustments_signal = gtk_signal_new ("set_scroll_adjustments", GTK_RUN_LAST, -#ifdef __WXGTK20__ - GTK_CLASS_TYPE(object_class), -#else object_class->type, -#endif GTK_SIGNAL_OFFSET (GtkPizzaClass, set_scroll_adjustments), gtk_marshal_NONE__POINTER_POINTER, GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); @@ -298,32 +279,15 @@ gtk_pizza_put (GtkPizza *pizza, pizza->children = g_list_append (pizza->children, child_info); - gtk_widget_set_parent (widget, GTK_WIDGET (pizza)); - if (GTK_WIDGET_REALIZED (pizza)) gtk_widget_set_parent_window (widget, pizza->bin_window); -#ifndef __WXGTK20__ /* FIXME? */ + gtk_widget_set_parent (widget, GTK_WIDGET (pizza)); + if (!IS_ONSCREEN (x, y)) GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN); -#endif - -/* - 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)) - gtk_widget_map (widget); - - gtk_widget_queue_resize (widget); - } -*/ } void @@ -487,11 +451,7 @@ gtk_pizza_map (GtkWidget *widget) if ( GTK_WIDGET_VISIBLE (child->widget) && !GTK_WIDGET_MAPPED (child->widget) && -#ifdef __WXGTK20__ - TRUE) -#else !GTK_WIDGET_IS_OFFSCREEN (child->widget)) -#endif { gtk_widget_map (child->widget); } @@ -514,7 +474,6 @@ gtk_pizza_realize (GtkWidget *widget) g_return_if_fail (GTK_IS_PIZZA (widget)); pizza = GTK_PIZZA (widget); - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); attributes.window_type = GDK_WINDOW_CHILD; @@ -588,7 +547,7 @@ gtk_pizza_realize (GtkWidget *widget) widget->style = gtk_style_attach (widget->style, widget->window); gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); gtk_style_set_background (widget->style, pizza->bin_window, GTK_STATE_NORMAL ); - + /* gdk_window_set_back_pixmap( widget->window, NULL, FALSE ); gdk_window_set_back_pixmap( pizza->bin_window, NULL, FALSE ); @@ -626,8 +585,8 @@ gtk_pizza_unrealize (GtkWidget *widget) gdk_window_destroy (pizza->bin_window); pizza->bin_window = NULL; - if (GTK_WIDGET_CLASS (parent_class)->unrealize) - (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); + if (GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) + (* GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) (widget); } static void @@ -711,8 +670,6 @@ gtk_pizza_size_allocate (GtkWidget *widget, } } -#ifndef __WXGTK20__ - static void gtk_pizza_draw (GtkWidget *widget, GdkRectangle *area) @@ -749,8 +706,6 @@ gtk_pizza_draw (GtkWidget *widget, } } -#endif /* __WXGTK20__ */ - static gint gtk_pizza_expose (GtkWidget *widget, GdkEventExpose *event) @@ -766,17 +721,11 @@ gtk_pizza_expose (GtkWidget *widget, pizza = GTK_PIZZA (widget); -#ifdef __WXGTK20__ - - (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); - -#else - - /* Sometimes, We handle all expose events in window.cpp now. */ - if (pizza->external_expose) + if (event->window != pizza->bin_window) return FALSE; - if (event->window != pizza->bin_window) + /* We handle all expose events in window.cpp now. */ + if (pizza->external_expose) return FALSE; children = pizza->children; @@ -794,11 +743,22 @@ gtk_pizza_expose (GtkWidget *widget, gtk_widget_event (child->widget, (GdkEvent*) &child_event); } } -#endif return TRUE; } +static void +gtk_pizza_style_set(GtkWidget *widget, GtkStyle *previous_style) +{ + if (GTK_WIDGET_REALIZED(widget)) + { + gtk_style_set_background(widget->style, widget->window, GTK_STATE_NORMAL); + 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); +} + static void gtk_pizza_add (GtkContainer *container, GtkWidget *widget) @@ -843,9 +803,7 @@ gtk_pizza_remove (GtkContainer *container, /* security checks */ g_return_if_fail (GTK_IS_WIDGET (widget)); -#ifndef __WXGTK20__ GTK_PRIVATE_UNSET_FLAG (widget, GTK_IS_OFFSCREEN); -#endif break; } @@ -880,46 +838,6 @@ gtk_pizza_forall (GtkContainer *container, } } - -/* Operations on children - */ - -static void -gtk_pizza_position_child (GtkPizza *pizza, - GtkPizzaChild *child) -{ - gint x; - gint y; - - x = child->x - pizza->xoffset; - y = child->y - pizza->yoffset; - - if (IS_ONSCREEN (x,y)) - { - if (GTK_WIDGET_MAPPED (pizza) && - GTK_WIDGET_VISIBLE (child->widget)) - { - if (!GTK_WIDGET_MAPPED (child->widget)) - gtk_widget_map (child->widget); - } - -#ifndef __WXGTK20__ - if (GTK_WIDGET_IS_OFFSCREEN (child->widget)) - GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN); -#endif - } - else - { -#ifndef __WXGTK20__ - if (!GTK_WIDGET_IS_OFFSCREEN (child->widget)) - GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN); -#endif - - if (GTK_WIDGET_MAPPED (child->widget)) - gtk_widget_unmap (child->widget); - } -} - static void gtk_pizza_allocate_child (GtkPizza *pizza, GtkPizzaChild *child) @@ -936,21 +854,6 @@ gtk_pizza_allocate_child (GtkPizza *pizza, gtk_widget_size_allocate (child->widget, &allocation); } -static void -gtk_pizza_position_children (GtkPizza *pizza) -{ - GList *tmp_list; - - tmp_list = pizza->children; - while (tmp_list) - { - GtkPizzaChild *child = tmp_list->data; - tmp_list = tmp_list->next; - - gtk_pizza_position_child (pizza, child); - } -} - static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget, gpointer cb_data) @@ -998,40 +901,54 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza, } } -/* Callbacks */ - -/* unused */ -#if 0 -/* Send a synthetic expose event to the widget - */ static void -gtk_pizza_expose_area (GtkPizza *pizza, - gint x, gint y, gint width, gint height) +gtk_pizza_position_child (GtkPizza *pizza, + GtkPizzaChild *child) { - if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED) - { - GdkEventExpose event; + gint x; + gint y; - event.type = GDK_EXPOSE; - event.send_event = TRUE; - event.window = pizza->bin_window; - event.count = 0; + x = child->x - pizza->xoffset; + y = child->y - pizza->yoffset; - event.area.x = x; - event.area.y = y; - event.area.width = width; - event.area.height = height; + if (IS_ONSCREEN (x,y)) + { + if (GTK_WIDGET_MAPPED (pizza) && + GTK_WIDGET_VISIBLE (child->widget)) + { + if (!GTK_WIDGET_MAPPED (child->widget)) + gtk_widget_map (child->widget); + } + + if (GTK_WIDGET_IS_OFFSCREEN (child->widget)) + GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN); + } + else + { + if (!GTK_WIDGET_IS_OFFSCREEN (child->widget)) + GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN); - gdk_window_ref (event.window); - gtk_widget_event (GTK_WIDGET (pizza), (GdkEvent *)&event); - gdk_window_unref (event.window); + if (GTK_WIDGET_MAPPED (child->widget)) + gtk_widget_unmap (child->widget); } } -#endif /* unused */ -/* This function is used to find events to process while scrolling - */ +static void +gtk_pizza_position_children (GtkPizza *pizza) +{ + GList *tmp_list; + + tmp_list = pizza->children; + while (tmp_list) + { + GtkPizzaChild *child = tmp_list->data; + tmp_list = tmp_list->next; + gtk_pizza_position_child (pizza, child); + } +} + +/* This function is used to find events to process while scrolling */ static Bool gtk_pizza_expose_predicate (Display *display, XEvent *xevent, @@ -1193,6 +1110,7 @@ gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) } } + /* The main event filter. Actually, we probably don't really need * to install this as a filter at all, since we are calling it * directly above in the expose-handling hack. But in case scrollbars @@ -1281,8 +1199,6 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent, return GDK_FILTER_CONTINUE; } - #ifdef __cplusplus } #endif /* __cplusplus */ -