extern "C" {
#endif /* __cplusplus */
+typedef struct _GtkPizzaChild GtkPizzaChild;
+typedef struct _GtkPizzaClass GtkPizzaClass;
typedef struct _GtkPizzaAdjData GtkPizzaAdjData;
+struct _GtkPizzaClass
+{
+ GtkContainerClass parent_class;
+
+ void (*set_scroll_adjustments) (GtkPizza *pizza,
+ GtkAdjustment *hadjustment,
+ GtkAdjustment *vadjustment);
+};
+
+struct _GtkPizzaChild
+{
+ GtkWidget *widget;
+ gint x;
+ gint y;
+};
+
struct _GtkPizzaAdjData
{
gint dx;
GtkRequisition *requisition);
static void gtk_pizza_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-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,
GtkAdjustment *hadj,
GtkAdjustment *vadj);
-/* static */
-GtkContainerClass *pizza_parent_class = NULL;
+static GtkWidgetClass* pizza_parent_class;
GtkType
gtk_pizza_get_type ()
sizeof (GtkPizza),
16, /* n_preallocs */
(GInstanceInitFunc) gtk_pizza_init,
+ NULL
};
pizza_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPizza", &pizza_info, (GTypeFlags)0);
}
widget_class->unrealize = gtk_pizza_unrealize;
widget_class->size_request = gtk_pizza_size_request;
widget_class->size_allocate = gtk_pizza_size_allocate;
- widget_class->expose_event = gtk_pizza_expose;
widget_class->style_set = gtk_pizza_style_set;
container_class->add = gtk_pizza_add;
{
GTK_WIDGET_UNSET_FLAGS (pizza, GTK_NO_WINDOW);
- pizza->shadow_type = GTK_MYSHADOW_NONE;
-
pizza->children = NULL;
pizza->bin_window = NULL;
pizza->m_xoffset = 0;
pizza->m_yoffset = 0;
-
- pizza->m_width = -1;
-
- pizza->external_expose = FALSE;
}
GtkWidget*
gint gtk_pizza_get_rtl_offset (GtkPizza *pizza)
{
- gint width;
+ gint border;
g_return_val_if_fail ( (pizza != NULL), 0 );
g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), 0 );
if (!pizza->bin_window) return 0;
- gdk_window_get_geometry( pizza->bin_window, NULL, NULL, &width, NULL, NULL );
-
- return width;
+ border = pizza->container.border_width;
+
+ return GTK_WIDGET(pizza)->allocation.width - border*2;
}
/* We handle scrolling in the wxScrolledWindow, not here. */
}
-void
-gtk_pizza_set_shadow_type (GtkPizza *pizza,
- GtkMyShadowType type)
-{
- g_return_if_fail (pizza != NULL);
- g_return_if_fail (GTK_IS_PIZZA (pizza));
-
- if (pizza->shadow_type != type)
- {
- pizza->shadow_type = type;
-
- if (GTK_WIDGET_VISIBLE (pizza))
- {
- gtk_widget_size_allocate (GTK_WIDGET (pizza), &(GTK_WIDGET (pizza)->allocation));
- gtk_widget_queue_draw (GTK_WIDGET (pizza));
- }
- }
-}
-
-void
-gtk_pizza_set_external (GtkPizza *pizza,
- gboolean expose)
-{
- g_return_if_fail (pizza != NULL);
- g_return_if_fail (GTK_IS_PIZZA (pizza));
-
- pizza->external_expose = expose;
-}
-
void
gtk_pizza_put (GtkPizza *pizza,
GtkWidget *widget,
g_return_if_fail (GTK_IS_PIZZA (pizza));
g_return_if_fail (widget != NULL);
- if (gtk_widget_get_direction( GTK_WIDGET(pizza) ) == GTK_TEXT_DIR_RTL)
- {
- // reverse horizontal placement
- x = pizza->m_width - x - width;
- }
-
child_info = g_new (GtkPizzaChild, 1);
child_info->widget = widget;
child_info->x = x;
child_info->y = y;
- child_info->width = width;
- child_info->height = height;
- if (GTK_IS_PIZZA(widget))
- GTK_PIZZA(widget)->m_width = width;
-
pizza->children = g_list_append (pizza->children, child_info);
if (GTK_WIDGET_REALIZED (pizza))
- gtk_widget_set_parent_window (widget, pizza->bin_window);
+ gtk_widget_set_parent_window (widget, pizza->bin_window);
gtk_widget_set_parent (widget, GTK_WIDGET (pizza));
- gtk_widget_set_size_request (widget, width, height);
+ gtk_widget_set_size_request( widget, width, height );
+ if (GTK_WIDGET_REALIZED (pizza))
+ gtk_pizza_allocate_child (pizza, child_info);
}
void
if (child->widget == widget)
{
- gint new_x = x;
- if (gtk_widget_get_direction( GTK_WIDGET(pizza) ) == GTK_TEXT_DIR_RTL)
- {
- // reverse horizontal placement
- new_x = pizza->m_width - new_x - width;
- }
-
- if ((child->x == new_x) &&
- (child->y == y) &&
- (child->width == width) &&
- (child->height == height)) return;
-
- child->x = new_x;
+ child->x = x;
child->y = y;
- child->width = width;
- child->height = height;
-
- if (GTK_IS_PIZZA(widget))
- GTK_PIZZA(widget)->m_width = width;
gtk_widget_set_size_request (widget, width, height);
gint attributes_mask;
GtkPizzaChild *child;
GList *children;
+ int border;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PIZZA (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)
- {
- /* GTK_MYSHADOW_THIN == wxSIMPLE_BORDER */
- attributes.x += 1;
- attributes.y += 1;
- attributes.width -= 2;
- attributes.height -= 2;
- }
- else
- {
- /* GTK_MYSHADOW_IN == wxSUNKEN_BORDER */
- /* GTK_MYSHADOW_OUT == wxRAISED_BORDER */
- attributes.x += 2;
- attributes.y += 2;
- attributes.width -= 4;
- attributes.height -= 4;
- }
-#endif /* __WXUNIVERSAL__ */
+ border = pizza->container.border_width;
+ attributes.x += border;
+ attributes.y += border;
+ attributes.width -= 2 * border;
+ attributes.height -= 2 * border;
/* minimal size */
if (attributes.width < 2) attributes.width = 2;
gdk_window_destroy (pizza->bin_window);
pizza->bin_window = NULL;
- if (GTK_WIDGET_CLASS (pizza_parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) (widget);
+ if (pizza_parent_class->unrealize)
+ pizza_parent_class->unrealize(widget);
}
static void
gint x,y,w,h;
GtkPizzaChild *child;
GList *children;
+ gboolean only_resize;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PIZZA(widget));
pizza = GTK_PIZZA (widget);
+ only_resize = ((widget->allocation.x == allocation->x) &&
+ (widget->allocation.y == allocation->y));
widget->allocation = *allocation;
- if (pizza->shadow_type == GTK_MYSHADOW_NONE)
- border = 0;
- else
- if (pizza->shadow_type == GTK_MYSHADOW_THIN)
- border = 1;
- else
- border = 2;
-
+ border = pizza->container.border_width;
+
x = allocation->x + border;
y = allocation->y + border;
w = allocation->width - border*2;
if (GTK_WIDGET_REALIZED (widget))
{
- gdk_window_move_resize( widget->window, x, y, w, h );
- gdk_window_move_resize( pizza->bin_window, 0, 0, w, h );
+ if (only_resize)
+ gdk_window_resize( widget->window, w, h );
+ else
+ gdk_window_move_resize( widget->window, x, y, w, h );
+
+ gdk_window_resize( pizza->bin_window, w, h );
}
children = pizza->children;
}
}
-static gint
-gtk_pizza_expose (GtkWidget *widget,
- GdkEventExpose *event)
-{
- GtkPizza *pizza;
-
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
-
- pizza = GTK_PIZZA (widget);
-
- if (event->window != pizza->bin_window)
- return FALSE;
-
- /* We handle all expose events in window.cpp now. */
- if (pizza->external_expose)
- return FALSE;
-
- (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, event);
-
- return FALSE;
-}
-
static void
gtk_pizza_style_set(GtkWidget *widget, GtkStyle *previous_style)
{
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);
+ pizza_parent_class->style_set(widget, previous_style);
}
static void
allocation.width = requisition.width;
allocation.height = requisition.height;
+ if (gtk_widget_get_direction( GTK_WIDGET(pizza) ) == GTK_TEXT_DIR_RTL)
+ {
+ /* reverse horizontal placement */
+ gint offset,border;
+
+ offset = GTK_WIDGET(pizza)->allocation.width;
+ border = pizza->container.border_width;
+ offset -= border*2;
+
+ allocation.x = offset - child->x - allocation.width + pizza->m_xoffset;
+ }
+
gtk_widget_size_allocate (child->widget, &allocation);
}
projects / wxWidgets.git / blobdiff