// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////// */
-#include "wx/gtk/win_gtk.h"
-#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"
#include "gdk/gdkx.h"
gint dy);
+/* unused */
+#if 0
static void gtk_pizza_expose_area (GtkPizza *pizza,
gint x,
gint y,
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);
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);
if (GTK_WIDGET_REALIZED (pizza))
gtk_widget_set_parent_window (widget, pizza->bin_window);
+#ifndef __WXGTK20__ /* FIXME? */
if (!IS_ONSCREEN (x, y))
GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN);
+#endif
/*
if (GTK_WIDGET_REALIZED (pizza))
}
}
+gint
+gtk_pizza_child_resized (GtkPizza *pizza,
+ GtkWidget *widget)
+{
+ GtkPizzaChild *child;
+ GList *children;
+
+ g_return_val_if_fail (pizza != NULL, FALSE);
+ g_return_val_if_fail (GTK_IS_PIZZA (pizza), FALSE);
+ g_return_val_if_fail (widget != NULL, FALSE);
+
+ children = pizza->children;
+ while (children)
+ {
+ child = children->data;
+ children = children->next;
+
+ if (child->widget == widget)
+ {
+ return ((child->width == widget->allocation.width) &&
+ (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);
}
/* security checks */
g_return_if_fail (GTK_IS_WIDGET (widget));
+#ifndef __WXGTK20__
GTK_PRIVATE_UNSET_FLAG (widget, GTK_IS_OFFSCREEN);
+#endif
break;
}
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);
/* Callbacks */
+/* unused */
+#if 0
/* Send a synthetic expose event to the widget
*/
static void
gdk_window_unref (event.window);
}
}
+#endif /* unused */
/* This function is used to find events to process while scrolling
*/
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;
}
/* This is the main routine to do the scrolling. Scrolling is
void
gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
{
- GtkWidget *widget;
- XEvent xevent;
+ GtkWidget *widget;
+ XEvent xevent;
- 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();
+ while (XCheckIfEvent(GDK_WINDOW_XDISPLAY (pizza->bin_window),
+ &xevent,
+ gtk_pizza_expose_predicate,
+ (XPointer)&GDK_WINDOW_XWINDOW (pizza->bin_window)))
{
- 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);
}
}
}
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
- {
- 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;
case ConfigureNotify:
- if ((xevent->xconfigure.x != 0) || (xevent->xconfigure.y != 0))
{
pizza->configure_serial = xevent->xconfigure.serial;
pizza->scroll_x = xevent->xconfigure.x;
}
-
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
projects / wxWidgets.git / blobdiff