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_add (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,
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);
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
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;
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;
widget_class->set_scroll_adjustments_signal =
gtk_signal_new ("set_scroll_adjustments",
GTK_RUN_LAST,
-
#ifdef __WXGTK20__
GTK_CLASS_TYPE(object_class),
#else
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
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.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 |
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
}
}
+#ifndef __WXGTK20__
+
static void
gtk_pizza_draw (GtkWidget *widget,
GdkRectangle *area)
}
}
+#endif /* __WXGTK20__ */
+
static gint
gtk_pizza_expose (GtkWidget *widget,
GdkEventExpose *event)
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)
{
gtk_widget_event (child->widget, (GdkEvent*) &child_event);
}
}
-
+
return TRUE;
+
+#endif
}
static void
}
}
+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,
x = child->x - pizza->xoffset;
y = child->y - pizza->yoffset;
+#ifndef __WXGTK20__
if (IS_ONSCREEN (x,y))
{
if (GTK_WIDGET_MAPPED (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)
}
}
-/* 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,
{
GtkWidget *widget;
XEvent xevent;
+ XID win;
gint x,y,w,h,border;
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;
return GDK_FILTER_CONTINUE;
}
+#endif /* __WXGTK20__ */
+
#ifdef __cplusplus
}
projects / wxWidgets.git / blobdiff