X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3dd9b88ac26caa8dbcc26c7fafc10cd886fc97ac..36d9119341753b2f6f606571702a9b906050a07c:/src/gtk1/win_gtk.c diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c index 2e69c20eef..d2d3ecdec5 100644 --- a/src/gtk1/win_gtk.c +++ b/src/gtk1/win_gtk.c @@ -23,6 +23,8 @@ extern "C" { #endif /* __cplusplus */ +#ifndef __WXGTK20__ + #include #include #include @@ -30,6 +32,8 @@ extern "C" { #define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \ (y >= G_MINSHORT) && (y <= G_MAXSHORT)) +#endif + typedef struct _GtkPizzaAdjData GtkPizzaAdjData; struct _GtkPizzaAdjData @@ -50,8 +54,10 @@ 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_add (GtkContainer *container, @@ -62,11 +68,12 @@ static void gtk_pizza_forall (GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data); +static void gtk_pizza_allocate_child (GtkPizza *pizza, + GtkPizzaChild *child); static void gtk_pizza_position_child (GtkPizza *pizza, GtkPizzaChild *child); -static void gtk_pizza_allocate_child (GtkPizza *pizza, - GtkPizzaChild *child); +#ifndef __WXGTK20__ static void gtk_pizza_position_children (GtkPizza *pizza); static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget, @@ -74,26 +81,13 @@ static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget, 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 GdkFilterReturn gtk_pizza_filter (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data); static GdkFilterReturn gtk_pizza_main_filter (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data); - +#endif /* __WXGTK20__ */ static GtkType gtk_pizza_child_type (GtkContainer *container); @@ -102,7 +96,12 @@ static void gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, GtkAdjustment *vadj); -static GtkContainerClass *parent_class = NULL; +#ifdef __WXGTK20__ + GtkContainerClass *pizza_parent_class = NULL; +#else +static GtkContainerClass *pizza_parent_class = NULL; +#endif + static gboolean gravity_works; guint @@ -112,18 +111,35 @@ gtk_pizza_get_type () if (!pizza_type) { + +#ifdef __WXGTK20__ + static const GTypeInfo pizza_info = + { + sizeof (GtkPizzaClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gtk_pizza_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GtkPizza), + 16, /* n_preallocs */ + (GInstanceInitFunc) gtk_pizza_init, + }; + pizza_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPizza", &pizza_info, 0); +#else 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); +#endif } return pizza_type; @@ -139,14 +155,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; container_class->add = gtk_pizza_add; @@ -160,7 +178,6 @@ 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 @@ -305,22 +322,7 @@ gtk_pizza_put (GtkPizza *pizza, 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 @@ -511,7 +513,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; @@ -521,18 +522,20 @@ 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) + } + 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 + } + else { /* GTK_MYSHADOW_IN == wxSUNKEN_BORDER */ /* GTK_MYSHADOW_OUT == wxRAISED_BORDER */ @@ -541,6 +544,7 @@ gtk_pizza_realize (GtkWidget *widget) attributes.width -= 4; attributes.height -= 4; } +#endif /* __WXUNIVERSAL__ */ /* minimal size */ if (attributes.width < 2) attributes.width = 2; @@ -561,6 +565,9 @@ gtk_pizza_realize (GtkWidget *widget) attributes.event_mask = gtk_widget_get_events (widget); attributes.event_mask |= GDK_EXPOSURE_MASK | +#ifdef __WXGTK20__ + GDK_SCROLL_MASK | +#endif GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | @@ -582,10 +589,17 @@ 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 ); +*/ +#ifndef __WXGTK20__ /* add filters for intercepting visibility and expose events */ gdk_window_add_filter (widget->window, gtk_pizza_main_filter, pizza); gdk_window_add_filter (pizza->bin_window, gtk_pizza_filter, pizza); +#endif /* we NEED gravity or we'll give up */ gravity_works = gdk_window_set_static_gravities (pizza->bin_window, TRUE); @@ -615,8 +629,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 @@ -700,6 +714,8 @@ gtk_pizza_size_allocate (GtkWidget *widget, } } +#ifndef __WXGTK20__ + static void gtk_pizza_draw (GtkWidget *widget, GdkRectangle *area) @@ -736,6 +752,8 @@ gtk_pizza_draw (GtkWidget *widget, } } +#endif /* __WXGTK20__ */ + static gint gtk_pizza_expose (GtkWidget *widget, GdkEventExpose *event) @@ -751,13 +769,21 @@ gtk_pizza_expose (GtkWidget *widget, pizza = GTK_PIZZA (widget); - /* 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; +#ifdef __WXGTK20__ + + (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, event); + + return FALSE; + +#else + children = pizza->children; while (children) { @@ -773,8 +799,10 @@ gtk_pizza_expose (GtkWidget *widget, gtk_widget_event (child->widget, (GdkEvent*) &child_event); } } - + return TRUE; + +#endif } static void @@ -844,7 +872,7 @@ gtk_pizza_forall (GtkContainer *container, g_return_if_fail (container != NULL); g_return_if_fail (GTK_IS_PIZZA (container)); - g_return_if_fail (callback != NULL); + g_return_if_fail (callback != (GtkCallback)NULL); pizza = GTK_PIZZA (container); @@ -858,9 +886,21 @@ gtk_pizza_forall (GtkContainer *container, } } +static void +gtk_pizza_allocate_child (GtkPizza *pizza, + GtkPizzaChild *child) +{ + GtkAllocation allocation; + GtkRequisition requisition; -/* Operations on children - */ + allocation.x = child->x - pizza->xoffset; + allocation.y = child->y - pizza->yoffset; + gtk_widget_get_child_requisition (child->widget, &requisition); + allocation.width = requisition.width; + allocation.height = requisition.height; + + gtk_widget_size_allocate (child->widget, &allocation); +} static void gtk_pizza_position_child (GtkPizza *pizza, @@ -872,6 +912,7 @@ gtk_pizza_position_child (GtkPizza *pizza, x = child->x - pizza->xoffset; y = child->y - pizza->yoffset; +#ifndef __WXGTK20__ if (IS_ONSCREEN (x,y)) { if (GTK_WIDGET_MAPPED (pizza) && @@ -881,38 +922,21 @@ gtk_pizza_position_child (GtkPizza *pizza, 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); } +#endif } -static void -gtk_pizza_allocate_child (GtkPizza *pizza, - GtkPizzaChild *child) -{ - GtkAllocation allocation; - GtkRequisition requisition; - - allocation.x = child->x - pizza->xoffset; - allocation.y = child->y - pizza->yoffset; - gtk_widget_get_child_requisition (child->widget, &requisition); - allocation.width = requisition.width; - allocation.height = requisition.height; - - gtk_widget_size_allocate (child->widget, &allocation); -} +#ifndef __WXGTK20__ static void gtk_pizza_position_children (GtkPizza *pizza) @@ -976,39 +1000,7 @@ 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) -{ - if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED) - { - GdkEventExpose event; - - 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; - - gdk_window_ref (event.window); - gtk_widget_event (GTK_WIDGET (pizza), (GdkEvent *)&event); - gdk_window_unref (event.window); - } -} -#endif /* unused */ - -/* This function is used to find events to process while scrolling - */ +/* This function is used to find events to process while scrolling */ static Bool gtk_pizza_expose_predicate (Display *display, @@ -1040,6 +1032,7 @@ gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) { GtkWidget *widget; XEvent xevent; + XID win; gint x,y,w,h,border; @@ -1134,10 +1127,12 @@ gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) gtk_pizza_position_children (pizza); gdk_flush(); + + win = GDK_WINDOW_XWINDOW (pizza->bin_window); while (XCheckIfEvent(GDK_WINDOW_XDISPLAY (pizza->bin_window), &xevent, gtk_pizza_expose_predicate, - (XPointer)&GDK_WINDOW_XWINDOW (pizza->bin_window))) + (XPointer)&win)) { GdkEvent event; GtkWidget *event_widget; @@ -1256,6 +1251,8 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent, return GDK_FILTER_CONTINUE; } +#endif /* __WXGTK20__ */ + #ifdef __cplusplus }