/////////////////////////////////////////////////////////////////////////// */
#include "wx/gtk/win_gtk.h"
-#include <gtk/gtkfeatures.h>
-
-/*-------------------------------------------------------------------------
-// conditional compilation
-//------------------------------------------------------------------------- */
-
-#if (GTK_MINOR_VERSION == 1)
-#if (GTK_MICRO_VERSION >= 5)
-#define NEW_GTK_CONSTRUCT_CODE
-#endif
-#endif
+#include "gtk/gtksignal.h"
+#include "gtk/gtknotebook.h"
#ifdef __cplusplus
extern "C" {
static void gtk_myfixed_class_init (GtkMyFixedClass *klass);
static void gtk_myfixed_init (GtkMyFixed *myfixed);
static void gtk_myfixed_map (GtkWidget *widget);
-#ifndef NEW_GTK_CONSTRUCT_CODE
+#if (GTK_MINOR_VERSION == 0)
static void gtk_myfixed_unmap (GtkWidget *widget);
#endif
static void gtk_myfixed_realize (GtkWidget *widget);
static void gtk_myfixed_remove (GtkContainer *container,
GtkWidget *widget);
static void gtk_myfixed_foreach (GtkContainer *container,
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
gboolean include_internals,
#endif
GtkCallback callback,
gpointer callback_data);
-#ifdef NEW_GTK_CONSTRUCT_CODE
+#if (GTK_MINOR_VERSION > 0)
static GtkType gtk_myfixed_child_type (GtkContainer *container);
#endif
+#if (GTK_MINOR_VERSION > 0)
+static void gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed,
+ GtkAdjustment *hadj,
+ GtkAdjustment *vadj);
+#endif
-static GtkContainerClass *parent_class = NULL;
+static GtkContainerClass *parent_class = NULL;
+
guint
gtk_myfixed_get_type ()
{
sizeof (GtkMyFixedClass),
(GtkClassInitFunc) gtk_myfixed_class_init,
(GtkObjectInitFunc) gtk_myfixed_init,
-#ifndef NEW_GTK_CONSTRUCT_CODE
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL,
-#else
+#if (GTK_MINOR_VERSION > 0)
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
+#else
+ (GtkArgSetFunc) NULL,
+ (GtkArgGetFunc) NULL,
#endif
};
widget_class = (GtkWidgetClass*) klass;
container_class = (GtkContainerClass*) klass;
-#ifndef NEW_GTK_CONSTRUCT_CODE
- parent_class = gtk_type_class (gtk_container_get_type ());
-#else
+#if (GTK_MINOR_VERSION > 0)
parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
+#else
+ parent_class = gtk_type_class (gtk_container_get_type ());
#endif
widget_class->map = gtk_myfixed_map;
-#ifndef NEW_GTK_CONSTRUCT_CODE
+#if (GTK_MINOR_VERSION == 0)
widget_class->unmap = gtk_myfixed_unmap;
#endif
widget_class->realize = gtk_myfixed_realize;
container_class->add = gtk_myfixed_add;
container_class->remove = gtk_myfixed_remove;
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
container_class->forall = gtk_myfixed_foreach;
#else
container_class->foreach = gtk_myfixed_foreach;
#endif
-#ifdef NEW_GTK_CONSTRUCT_CODE
+#if (GTK_MINOR_VERSION > 0)
container_class->child_type = gtk_myfixed_child_type;
#endif
+
+#if (GTK_MINOR_VERSION > 0)
+ klass->set_scroll_adjustments = gtk_myfixed_scroll_set_adjustments;
+
+ widget_class->set_scroll_adjustments_signal =
+ gtk_signal_new ("set_scroll_adjustments",
+ GTK_RUN_LAST,
+ object_class->type,
+ GTK_SIGNAL_OFFSET (GtkMyFixedClass, set_scroll_adjustments),
+ gtk_marshal_NONE__POINTER_POINTER,
+ GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
+#endif
}
-#ifdef NEW_GTK_CONSTRUCT_CODE
+#if (GTK_MINOR_VERSION > 0)
static GtkType
gtk_myfixed_child_type (GtkContainer *container)
{
{
GTK_WIDGET_UNSET_FLAGS (myfixed, GTK_NO_WINDOW);
-#ifndef NEW_GTK_CONSTRUCT_CODE
+#if (GTK_MINOR_VERSION == 0)
GTK_WIDGET_SET_FLAGS (myfixed, GTK_BASIC);
#endif
+#if (GTK_MINOR_VERSION > 0)
+ myfixed->shadow_type = GTK_SHADOW_NONE;
+#endif
+
myfixed->children = NULL;
}
return GTK_WIDGET (myfixed);
}
+#if (GTK_MINOR_VERSION > 0)
+void gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed,
+ GtkAdjustment *hadj,
+ GtkAdjustment *vadj)
+{
+ /* OK, this is embarassing, but this function has to be here */
+}
+
+void
+gtk_myfixed_set_shadow_type (GtkMyFixed *myfixed,
+ GtkShadowType type)
+{
+ g_return_if_fail (myfixed != NULL);
+ g_return_if_fail (GTK_IS_MYFIXED (myfixed));
+
+ if ((GtkShadowType) myfixed->shadow_type != type)
+ {
+ myfixed->shadow_type = type;
+
+ if (GTK_WIDGET_VISIBLE (myfixed))
+ {
+ gtk_widget_size_allocate (GTK_WIDGET (myfixed), &(GTK_WIDGET (myfixed)->allocation));
+ gtk_widget_queue_draw (GTK_WIDGET (myfixed));
+ }
+ }
+}
+#endif
+
void
-gtk_myfixed_put (GtkMyFixed *myfixed,
+gtk_myfixed_put (GtkMyFixed *myfixed,
GtkWidget *widget,
gint16 x,
gint16 y)
}
}
-#ifndef NEW_GTK_CONSTRUCT_CODE
+#if (GTK_MINOR_VERSION == 0)
static void
gtk_myfixed_unmap (GtkWidget *widget)
{
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
attributes.window_type = GDK_WINDOW_CHILD;
+
+#if (GTK_MINOR_VERSION > 0)
+ attributes.x = widget->allocation.x;
+ attributes.y = widget->allocation.y;
+ attributes.width = widget->allocation.width;
+ attributes.height = widget->allocation.height;
+
+ if (myfixed->shadow_type != GTK_SHADOW_NONE)
+ {
+ attributes.x += 2;
+ attributes.y += 2;
+ attributes.width -= 4;
+ attributes.height -= 4;
+ }
+
+ if (attributes.width < 2) attributes.width = 2;
+ if (attributes.height < 2) attributes.height = 2;
+#else
attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y;
attributes.width = 32000;
attributes.height = 32000;
+#endif
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
attributes.colormap = gtk_widget_get_colormap (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 |
myfixed = GTK_MYFIXED (widget);
+/*
requisition->width = 0;
requisition->height = 0;
+*/
+ requisition->width = widget->requisition.width;
+ requisition->height = widget->requisition.height;
children = myfixed->children;
while (children)
GtkAllocation *allocation)
{
GtkMyFixed *myfixed;
+ gint border;
GtkMyFixedChild *child;
- GtkAllocation child_allocation;
- GList *children;
- guint16 border_width;
+ GtkAllocation child_allocation;
+ GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MYFIXED(widget));
g_return_if_fail (allocation != NULL);
myfixed = GTK_MYFIXED (widget);
+
+ widget->allocation = *allocation;
+#if (GTK_MINOR_VERSION > 0)
+ if (myfixed->shadow_type == GTK_SHADOW_NONE)
+ border = 0;
+ else
+ border = 2;
+#else
+ border = 0;
+#endif
- widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED (widget))
- gdk_window_move_resize (widget->window, allocation->x, allocation->y, 32000, 32000 );
+ {
+ gdk_window_move_resize( widget->window,
+ allocation->x+border, allocation->y+border,
+#if (GTK_MINOR_VERSION > 0)
+ allocation->width-border*2, allocation->height-border*2
+#else
+ 32000, 32000
+#endif
+ );
+ }
- border_width = GTK_CONTAINER (myfixed)->border_width;
-
children = myfixed->children;
while (children)
{
child = children->data;
children = children->next;
-
- if (GTK_WIDGET_VISIBLE (child->widget))
+
+ /* please look at the text in wxWindow::DoSetSize() on why the
+ test GTK_WIDGET_REALIZED() has to be here */
+ if (GTK_WIDGET_VISIBLE (child->widget) &&
+ !(!GTK_WIDGET_REALIZED(child->widget) &&
+ GTK_IS_NOTEBOOK(child->widget) ))
{
- child_allocation.x = child->x + border_width;
- child_allocation.y = child->y + border_width;
+ child_allocation.x = child->x;
+ child_allocation.y = child->y;
child_allocation.width = child->widget->requisition.width;
child_allocation.height = child->widget->requisition.height;
gtk_widget_size_allocate (child->widget, &child_allocation);
static void
gtk_myfixed_foreach (GtkContainer *container,
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
gboolean include_internals,
#endif
GtkCallback callback,
projects / wxWidgets.git / blobdiff