#include "wx/platform.h"
#include "wx/gtk/win_gtk.h"
-#include "gtk/gtksignal.h"
-#include "gtk/gtkprivate.h"
-#include "gdk/gdkx.h"
#ifdef __cplusplus
extern "C" {
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->width = 20;
- pizza->height = 20;
-
pizza->bin_window = NULL;
- pizza->xoffset = 0;
- pizza->yoffset = 0;
-
- pizza->configure_serial = 0;
- pizza->scroll_x = 0;
- pizza->scroll_y = 0;
- pizza->visibility = GDK_VISIBILITY_PARTIAL;
-
- pizza->clear_on_draw = TRUE;
- pizza->use_filter = TRUE;
- pizza->external_expose = FALSE;
+ pizza->m_xoffset = 0;
+ pizza->m_yoffset = 0;
}
GtkWidget*
{
GtkPizza *pizza;
- pizza = gtk_type_new (gtk_pizza_get_type ());
+ pizza = g_object_new (gtk_pizza_get_type (), NULL);
return GTK_WIDGET (pizza);
}
-static void
-gtk_pizza_scroll_set_adjustments (GtkPizza *pizza,
- GtkAdjustment *hadj,
- GtkAdjustment *vadj)
+gint gtk_pizza_get_xoffset (GtkPizza *pizza)
{
- /* We handle scrolling in the wxScrolledWindow, not here. */
+ g_return_val_if_fail ( (pizza != NULL), -1 );
+ g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), -1 );
+
+ return pizza->m_xoffset;
}
-void
-gtk_pizza_set_shadow_type (GtkPizza *pizza,
- GtkMyShadowType type)
+gint gtk_pizza_get_yoffset (GtkPizza *pizza)
{
- g_return_if_fail (pizza != NULL);
- g_return_if_fail (GTK_IS_PIZZA (pizza));
+ g_return_val_if_fail ( (pizza != NULL), -1 );
+ g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), -1 );
- if ((GtkMyShadowType) 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));
- }
- }
+ return pizza->m_yoffset;
}
-void
-gtk_pizza_set_clear (GtkPizza *pizza,
- gboolean clear)
+void gtk_pizza_set_xoffset (GtkPizza *pizza, gint xoffset)
{
g_return_if_fail (pizza != NULL);
g_return_if_fail (GTK_IS_PIZZA (pizza));
- pizza->clear_on_draw = clear;
+ pizza->m_xoffset = xoffset;
+ // do something
}
-void
-gtk_pizza_set_filter (GtkPizza *pizza,
- gboolean use)
+void gtk_pizza_set_yoffset (GtkPizza *pizza, gint yoffset)
{
g_return_if_fail (pizza != NULL);
g_return_if_fail (GTK_IS_PIZZA (pizza));
- pizza->use_filter = use;
+ pizza->m_xoffset = yoffset;
+ // do something
}
-void
-gtk_pizza_set_external (GtkPizza *pizza,
- gboolean expose)
+gint gtk_pizza_get_rtl_offset (GtkPizza *pizza)
{
- g_return_if_fail (pizza != NULL);
- g_return_if_fail (GTK_IS_PIZZA (pizza));
+ 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;
+
+ border = pizza->container.border_width;
+
+ return GTK_WIDGET(pizza)->allocation.width - border*2;
+}
+
- pizza->external_expose = expose;
+static void
+gtk_pizza_scroll_set_adjustments (GtkPizza *pizza,
+ GtkAdjustment *hadj,
+ GtkAdjustment *vadj)
+{
+ /* We handle scrolling in the wxScrolledWindow, not here. */
}
void
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);
-}
-
-void
-gtk_pizza_move (GtkPizza *pizza,
- GtkWidget *widget,
- gint x,
- gint y)
-{
- GtkPizzaChild *child;
- GList *children;
-
- g_return_if_fail (pizza != NULL);
- g_return_if_fail (GTK_IS_PIZZA (pizza));
- g_return_if_fail (widget != NULL);
-
- children = pizza->children;
- while (children)
- {
- child = children->data;
- children = children->next;
-
- if (child->widget == widget)
- {
- if ((child->x == x) && (child->y == y))
- break;
-
- child->x = x;
- child->y = y;
-
- if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
- gtk_widget_queue_resize (widget);
- break;
- }
- }
-}
-
-void
-gtk_pizza_resize (GtkPizza *pizza,
- GtkWidget *widget,
- gint width,
- gint height)
-{
- GtkPizzaChild *child;
- GList *children;
-
- g_return_if_fail (pizza != NULL);
- g_return_if_fail (GTK_IS_PIZZA (pizza));
- g_return_if_fail (widget != NULL);
-
- children = pizza->children;
- while (children)
- {
- child = children->data;
- children = children->next;
-
- if (child->widget == widget)
- {
- if ((child->width == width) && (child->height == height))
- break;
-
- child->width = width;
- child->height = height;
-
- gtk_widget_set_size_request (widget, width, height);
-
- if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
- gtk_widget_queue_resize (widget);
- break;
- }
- }
+ gtk_widget_set_size_request( widget, width, height );
+ if (GTK_WIDGET_REALIZED (pizza))
+ gtk_pizza_allocate_child (pizza, child_info);
}
void
g_return_if_fail (GTK_IS_PIZZA (pizza));
g_return_if_fail (widget != NULL);
+#ifndef WX_WARN_ILLEGAL_SETSIZE
/* this really shouldn't happen -- but it does, a lot, right now and we
- can't pass negative values to gtk_widget_set_size_request(), so filter
- them out here */
+ can't pass negative values to gtk_widget_set_size_request() without getting
+ a warning printed out, so filter them out here */
if ( width < 0 )
width = 0;
if ( height < 0 )
height = 0;
+#endif
children = pizza->children;
while (children)
child->y = y;
child->width = width;
child->height = height;
-
+
gtk_widget_set_size_request (widget, width, height);
- if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
- gtk_widget_queue_resize (widget);
-
return;
}
}
}
-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)
{
children = children->next;
if ( GTK_WIDGET_VISIBLE (child->widget) &&
- !GTK_WIDGET_MAPPED (child->widget) &&
- TRUE)
+ !GTK_WIDGET_MAPPED (child->widget) )
{
gtk_widget_map (child->widget);
}
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;
h = allocation->height - border*2;
+ if (w < 0)
+ w = 0;
+ if (h < 0)
+ h = 0;
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
GtkAllocation allocation;
GtkRequisition requisition;
- allocation.x = child->x - pizza->xoffset;
- allocation.y = child->y - pizza->yoffset;
+ allocation.x = child->x - pizza->m_xoffset;
+ allocation.y = child->y - pizza->m_yoffset;
gtk_widget_get_child_requisition (child->widget, &requisition);
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);
}
}
}
-
-/* This is the main routine to do the scrolling. Scrolling is
- * done by "Guffaw" scrolling, as in the Mozilla XFE, with
- * a few modifications.
- *
- * The main improvement is that we keep track of whether we
- * are obscured or not. If not, we ignore the generated expose
- * events and instead do the exposes ourself, without having
- * to wait for a roundtrip to the server. This also provides
- * a limited form of expose-event compression, since we do
- * the affected area as one big chunk.
- */
-
void
gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
{
- pizza->xoffset += dx;
- pizza->yoffset += dy;
+ pizza->m_xoffset += dx;
+ pizza->m_yoffset += dy;
gtk_pizza_adjust_allocations (pizza, -dx, -dy);
projects / wxWidgets.git / blobdiff