/* ///////////////////////////////////////////////////////////////////////////
// Name: win_gtk.c
-// Purpose: Native GTK+ widget for wxWindows, based on GtkLayout and
+// 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 gtk_widget_get_child_requisition gtk_widget_get_child_requisitio
-#define gtk_marshal_NONE__POINTER_POINTER gtk_marshal_NONE__POINTER_POINT
+#ifdef VMS
+#define XCheckIfEvent XCHECKIFEVENT
#endif
+#include "wx/setup.h"
#include "wx/gtk/win_gtk.h"
#include "gtk/gtksignal.h"
#include "gtk/gtkprivate.h"
extern "C" {
#endif /* __cplusplus */
+#ifndef __WXGTK20__
+
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \
(y >= G_MINSHORT) && (y <= G_MAXSHORT))
+#endif
+
typedef struct _GtkPizzaAdjData GtkPizzaAdjData;
struct _GtkPizzaAdjData
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,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
+
+static void gtk_pizza_allocate_child (GtkPizza *pizza,
+ GtkPizzaChild *child);
+static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
+ gpointer cb_data);
+#ifndef __WXGTK20__
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);
-
-
-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);
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);
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
+GtkType
gtk_pizza_get_type ()
{
- static guint pizza_type = 0;
+ static GtkType pizza_type = 0;
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;
}
+#if __WXGTK20__
+// Marshaller needed for set_scroll_adjustments signal,
+// generated with GLib-2.4.6 glib-genmarshal
+#define g_marshal_value_peek_object(v) g_value_get_object (v)
+static void
+g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
+ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1,
+ gpointer arg_1,
+ gpointer arg_2,
+ gpointer data2);
+ register GMarshalFunc_VOID__OBJECT_OBJECT callback;
+ register GCClosure *cc = (GCClosure*) closure;
+ register gpointer data1, data2;
+
+ g_return_if_fail (n_param_values == 3);
+
+ if (G_CCLOSURE_SWAP_DATA (closure))
+ {
+ data1 = closure->data;
+ data2 = g_value_peek_pointer (param_values + 0);
+ }
+ else
+ {
+ data1 = g_value_peek_pointer (param_values + 0);
+ data2 = closure->data;
+ }
+ callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
+
+ callback (data1,
+ g_marshal_value_peek_object (param_values + 1),
+ g_marshal_value_peek_object (param_values + 2),
+ data2);
+}
+#endif // __WXGTK20__
+
static void
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;
klass->set_scroll_adjustments = gtk_pizza_scroll_set_adjustments;
widget_class->set_scroll_adjustments_signal =
+#if __WXGTK20__
+ g_signal_new(
+ "set_scroll_adjustments",
+ G_TYPE_FROM_CLASS(object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(GtkPizzaClass, set_scroll_adjustments),
+ NULL,
+ NULL,
+ g_cclosure_user_marshal_VOID__OBJECT_OBJECT,
+ G_TYPE_NONE,
+ 2,
+ GTK_TYPE_ADJUSTMENT,
+ GTK_TYPE_ADJUSTMENT);
+#else
gtk_signal_new ("set_scroll_adjustments",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkPizzaClass, set_scroll_adjustments),
gtk_marshal_NONE__POINTER_POINTER,
GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
+#endif // __WXGTK20__
}
static GtkType
pizza->height = 20;
pizza->bin_window = NULL;
-
+
pizza->xoffset = 0;
pizza->yoffset = 0;
pizza->clear_on_draw = clear;
}
-void
+void
gtk_pizza_set_filter (GtkPizza *pizza,
gboolean use)
{
g_return_if_fail (GTK_IS_PIZZA (pizza));
pizza->use_filter = use;
-}
-
-void
+}
+
+void
gtk_pizza_set_external (GtkPizza *pizza,
gboolean expose)
{
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);
+ gtk_widget_set_parent (widget, GTK_WIDGET (pizza));
+
+#ifndef __WXGTK20__ /* FIXME? */
if (!IS_ONSCREEN (x, y))
GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN);
-
-/*
- if (GTK_WIDGET_REALIZED (pizza))
- gtk_widget_realize (widget);
-*/
+#endif
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
child->x = x;
child->y = y;
-
+
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
gtk_widget_queue_resize (widget);
break;
}
}
-gint
+gint
gtk_pizza_child_resized (GtkPizza *pizza,
GtkWidget *widget)
{
(child->height == widget->allocation.height));
}
}
-
+
return FALSE;
}
-
+
static void
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);
}
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;
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 */
attributes.width -= 4;
attributes.height -= 4;
}
+#endif /* __WXUNIVERSAL__ */
/* minimal size */
if (attributes.width < 2) attributes.width = 2;
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
attributes.colormap = gtk_widget_get_colormap (widget);
- attributes.event_mask =
- GDK_VISIBILITY_NOTIFY_MASK;
+ attributes.event_mask = 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),
attributes.y = 0;
attributes.event_mask = gtk_widget_get_events (widget);
- attributes.event_mask |=
- GDK_EXPOSURE_MASK |
- GDK_POINTER_MOTION_MASK |
- GDK_POINTER_MOTION_HINT_MASK |
- GDK_BUTTON_MOTION_MASK |
- GDK_BUTTON1_MOTION_MASK |
- GDK_BUTTON2_MOTION_MASK |
- GDK_BUTTON3_MOTION_MASK |
- GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK |
- GDK_KEY_PRESS_MASK |
- GDK_KEY_RELEASE_MASK |
- GDK_ENTER_NOTIFY_MASK |
- GDK_LEAVE_NOTIFY_MASK |
- GDK_FOCUS_CHANGE_MASK;
+ 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 |
+ GDK_BUTTON1_MOTION_MASK |
+ GDK_BUTTON2_MOTION_MASK |
+ GDK_BUTTON3_MOTION_MASK |
+ GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK |
+ GDK_KEY_PRESS_MASK |
+ GDK_KEY_RELEASE_MASK |
+ GDK_ENTER_NOTIFY_MASK |
+ GDK_LEAVE_NOTIFY_MASK |
+ GDK_FOCUS_CHANGE_MASK;
pizza->bin_window = gdk_window_new(widget->window,
&attributes, attributes_mask);
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);
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
child = children->data;
children = children->next;
+#ifndef __WXGTK20__
gtk_pizza_position_child (pizza, child);
+#endif
gtk_pizza_allocate_child (pizza, child);
}
}
+#ifndef __WXGTK20__
+
static void
gtk_pizza_draw (GtkWidget *widget,
GdkRectangle *area)
}
}
+#endif /* __WXGTK20__ */
+
static gint
gtk_pizza_expose (GtkWidget *widget,
GdkEventExpose *event)
{
GtkPizza *pizza;
+#ifndef __WXGTK20__
GtkPizzaChild *child;
GdkEventExpose child_event;
GList *children;
+#endif
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE);
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)
{
}
return TRUE;
+
+#endif
+}
+
+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
/* security checks */
g_return_if_fail (GTK_IS_WIDGET (widget));
+#ifndef __WXGTK20__
GTK_PRIVATE_UNSET_FLAG (widget, GTK_IS_OFFSCREEN);
+#endif
break;
}
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);
}
}
-
-/* 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);
- }
-
- 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);
-
- if (GTK_WIDGET_MAPPED (child->widget))
- gtk_widget_unmap (child->widget);
- }
-}
-
static void
gtk_pizza_allocate_child (GtkPizza *pizza,
GtkPizzaChild *child)
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)
}
}
-/* Callbacks */
-
-/* Send a synthetic expose event to the widget
- */
+#ifndef __WXGTK20__
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);
}
}
-/* 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,
XPointer arg)
{
- if ((xevent->type == Expose) ||
- ((xevent->xany.window == *(Window *)arg) &&
+ if ((xevent->type == Expose) ||
+ ((xevent->xany.window == *(Window *)arg) &&
(xevent->type == ConfigureNotify)))
- return True;
- else
- return False;
+ return True;
+ else
+ return False;
}
+#endif /* __WXGTK20__ */
/* This is the main routine to do the scrolling. Scrolling is
* done by "Guffaw" scrolling, as in the Mozilla XFE, with
void
gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
{
- GtkWidget *widget;
- XEvent xevent;
+#ifdef __WXGTK20__
+ pizza->xoffset += dx;
+ pizza->yoffset += dy;
+
+ gtk_pizza_adjust_allocations (pizza, -dx, -dy);
+
+ if (pizza->bin_window)
+ gdk_window_scroll( pizza->bin_window, -dx, -dy );
+#else
+ GtkWidget *widget;
+ XEvent xevent;
+ XID win;
- gint x,y,w,h,border;
+ gint x,y,w,h,border;
- widget = GTK_WIDGET (pizza);
+ widget = GTK_WIDGET (pizza);
- pizza->xoffset += dx;
- pizza->yoffset += dy;
+ pizza->xoffset += dx;
+ pizza->yoffset += dy;
- if (!GTK_WIDGET_MAPPED (pizza))
+ if (!GTK_WIDGET_MAPPED (pizza))
{
- gtk_pizza_position_children (pizza);
- return;
+ gtk_pizza_position_children (pizza);
+ return;
}
- gtk_pizza_adjust_allocations (pizza, -dx, -dy);
+ gtk_pizza_adjust_allocations (pizza, -dx, -dy);
- if (pizza->shadow_type == GTK_MYSHADOW_NONE)
- border = 0;
- else
- if (pizza->shadow_type == GTK_MYSHADOW_THIN)
- border = 1;
- else
- border = 2;
+ if (pizza->shadow_type == GTK_MYSHADOW_NONE)
+ border = 0;
+ else
+ if (pizza->shadow_type == GTK_MYSHADOW_THIN)
+ border = 1;
+ else
+ border = 2;
- x = 0;
- y = 0;
- w = widget->allocation.width - 2*border;
- h = widget->allocation.height - 2*border;
+ x = 0;
+ y = 0;
+ w = widget->allocation.width - 2*border;
+ h = widget->allocation.height - 2*border;
- if (dx > 0)
+ if (dx > 0)
{
- if (gravity_works)
+ if (gravity_works)
{
gdk_window_resize (pizza->bin_window,
w + dx,
gdk_window_move (pizza->bin_window, x-dx, y);
gdk_window_move_resize (pizza->bin_window, x, y, w, h );
}
- else
+ else
{
/* FIXME */
}
-
- gtk_pizza_expose_area (pizza,
- MAX ((gint)w - dx, 0),
- 0,
- MIN (dx, w),
- h);
}
- else if (dx < 0)
+ else if (dx < 0)
{
- if (gravity_works)
+ if (gravity_works)
{
gdk_window_move_resize (pizza->bin_window,
x + dx,
gdk_window_move (pizza->bin_window, x, y);
gdk_window_resize (pizza->bin_window, w, h );
}
- else
+ else
{
/* FIXME */
}
-
- gtk_pizza_expose_area (pizza,
- 0,
- 0,
- MIN (-dx, w),
- h);
}
- if (dy > 0)
+ if (dy > 0)
{
- if (gravity_works)
+ if (gravity_works)
{
gdk_window_resize (pizza->bin_window, w, h + dy);
gdk_window_move (pizza->bin_window, x, y-dy);
gdk_window_move_resize (pizza->bin_window,
x, y, w, h );
}
- else
+ else
{
/* FIXME */
}
-
- gtk_pizza_expose_area (pizza,
- 0,
- MAX ((gint)h - dy, 0),
- w,
- MIN (dy, h));
}
- else if (dy < 0)
+ else if (dy < 0)
{
- if (gravity_works)
+ if (gravity_works)
{
gdk_window_move_resize (pizza->bin_window,
x, y+dy, w, h - dy );
gdk_window_move (pizza->bin_window, x, y);
gdk_window_resize (pizza->bin_window, w, h );
}
- else
+ else
{
/* FIXME */
}
- gtk_pizza_expose_area (pizza,
- 0,
- 0,
- w,
- MIN (-dy, (gint)h));
}
- gtk_pizza_position_children (pizza);
-
- /* We have to make sure that all exposes from this scroll get
- * processed before we scroll again, or the expose events will
- * have invalid coordinates.
- *
- * We also do expose events for other windows, since otherwise
- * their updating will fall behind the scrolling
- *
- * This also avoids a problem in pre-1.0 GTK where filters don't
- * have access to configure events that were compressed.
- */
-
- gdk_flush();
- while (XCheckIfEvent(GDK_WINDOW_XDISPLAY (pizza->bin_window),
- &xevent,
- gtk_pizza_expose_predicate,
- (XPointer)&GDK_WINDOW_XWINDOW (pizza->bin_window)))
+ 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)&win))
{
- GdkEvent event;
- GtkWidget *event_widget;
+ GdkEvent event;
+ GtkWidget *event_widget;
- if ((xevent.xany.window == GDK_WINDOW_XWINDOW (pizza->bin_window)) &&
- (gtk_pizza_filter (&xevent, &event, pizza) == GDK_FILTER_REMOVE))
- continue;
+ if ((xevent.xany.window == GDK_WINDOW_XWINDOW (pizza->bin_window)) )
+ gtk_pizza_filter (&xevent, &event, pizza);
- if (xevent.type == Expose)
+ if (xevent.type == Expose)
{
- event.expose.window = gdk_window_lookup (xevent.xany.window);
- gdk_window_get_user_data (event.expose.window,
+ event.expose.window = gdk_window_lookup (xevent.xany.window);
+ gdk_window_get_user_data (event.expose.window,
(gpointer *)&event_widget);
- if (event_widget)
+ if (event_widget)
{
- event.expose.type = GDK_EXPOSE;
- event.expose.area.x = xevent.xexpose.x;
- event.expose.area.y = xevent.xexpose.y;
- event.expose.area.width = xevent.xexpose.width;
- event.expose.area.height = xevent.xexpose.height;
- event.expose.count = xevent.xexpose.count;
-
- gdk_window_ref (event.expose.window);
- gtk_widget_event (event_widget, &event);
- gdk_window_unref (event.expose.window);
+ event.expose.type = GDK_EXPOSE;
+ event.expose.area.x = xevent.xexpose.x;
+ event.expose.area.y = xevent.xexpose.y;
+ event.expose.area.width = xevent.xexpose.width;
+ event.expose.area.height = xevent.xexpose.height;
+ event.expose.count = xevent.xexpose.count;
+
+ gdk_window_ref (event.expose.window);
+ gtk_widget_event (event_widget, &event);
+ gdk_window_unref (event.expose.window);
}
}
}
+#endif /* __WXGTK20__ */
}
+
+#ifndef __WXGTK20__
/* 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
GtkPizza *pizza;
xevent = (XEvent *)gdk_xevent;
-
+
pizza = GTK_PIZZA (data);
-
+
if (!pizza->use_filter)
return GDK_FILTER_CONTINUE;
- switch (xevent->type)
+ switch (xevent->type)
{
- case Expose:
- if (xevent->xexpose.serial == pizza->configure_serial)
- {
- if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED)
- return GDK_FILTER_REMOVE;
- else
+ case Expose:
+ if (xevent->xexpose.serial == pizza->configure_serial)
{
- xevent->xexpose.x += pizza->scroll_x;
- xevent->xexpose.y += pizza->scroll_y;
-
- break;
+ xevent->xexpose.x += pizza->scroll_x;
+ xevent->xexpose.y += pizza->scroll_y;
}
- }
- break;
+ break;
- case ConfigureNotify:
- if ((xevent->xconfigure.x != 0) || (xevent->xconfigure.y != 0))
- {
- pizza->configure_serial = xevent->xconfigure.serial;
- pizza->scroll_x = xevent->xconfigure.x;
- pizza->scroll_y = xevent->xconfigure.y;
- }
- break;
+ case ConfigureNotify:
+ {
+ pizza->configure_serial = xevent->xconfigure.serial;
+ pizza->scroll_x = xevent->xconfigure.x;
+ pizza->scroll_y = xevent->xconfigure.y;
+ }
+ break;
}
return GDK_FILTER_CONTINUE;
xevent = (XEvent *)gdk_xevent;
pizza = GTK_PIZZA (data);
-
+
if (!pizza->use_filter)
return GDK_FILTER_CONTINUE;
pizza->visibility = GDK_VISIBILITY_UNOBSCURED;
break;
}
-
+
return GDK_FILTER_REMOVE;
}
return GDK_FILTER_CONTINUE;
}
-
-
+#endif /* __WXGTK20__ */
#ifdef __cplusplus
projects / wxWidgets.git / blobdiff