X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d4c99d6fa89db127a4708ce674595d02eeccf2fc..e487524e492809638b7e335937c41fd432458a54:/src/gtk1/win_gtk.c?ds=sidebyside diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c index e823bfa4a8..40c65a8785 100644 --- a/src/gtk1/win_gtk.c +++ b/src/gtk1/win_gtk.c @@ -1,14 +1,24 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx_gtk.h -// Purpose: +/* /////////////////////////////////////////////////////////////////////////// +// Name: win_gtk.c +// Purpose: native GTK+ widget for wxWindows // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////// */ #include "wx/gtk/win_gtk.h" +#include + +/*------------------------------------------------------------------------- +// conditional compilation +//------------------------------------------------------------------------- */ + +#if (GTK_MINOR_VERSION == 1) +#if (GTK_MICRO_VERSION >= 5) +#define NEW_GTK_CONSTRUCT_CODE +#endif +#endif #ifdef __cplusplus extern "C" { @@ -17,7 +27,9 @@ 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 static void gtk_myfixed_unmap (GtkWidget *widget); +#endif static void gtk_myfixed_realize (GtkWidget *widget); static void gtk_myfixed_size_request (GtkWidget *widget, GtkRequisition *requisition); @@ -34,8 +46,14 @@ static void gtk_myfixed_add (GtkContainer *container, static void gtk_myfixed_remove (GtkContainer *container, GtkWidget *widget); static void gtk_myfixed_foreach (GtkContainer *container, +#if (GTK_MINOR_VERSION == 1) + gboolean include_internals, +#endif GtkCallback callback, gpointer callback_data); +#ifdef NEW_GTK_CONSTRUCT_CODE +static GtkType gtk_myfixed_child_type (GtkContainer *container); +#endif static GtkContainerClass *parent_class = NULL; @@ -55,8 +73,14 @@ gtk_myfixed_get_type () sizeof (GtkMyFixedClass), (GtkClassInitFunc) gtk_myfixed_class_init, (GtkObjectInitFunc) gtk_myfixed_init, - (GtkArgSetFunc) NULL, +#ifndef NEW_GTK_CONSTRUCT_CODE + (GtkArgSetFunc) NULL, (GtkArgGetFunc) NULL, +#else + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, + (GtkClassInitFunc) NULL, +#endif }; myfixed_type = gtk_type_unique (gtk_container_get_type (), &myfixed_info); @@ -75,11 +99,17 @@ gtk_myfixed_class_init (GtkMyFixedClass *klass) object_class = (GtkObjectClass*) klass; widget_class = (GtkWidgetClass*) klass; container_class = (GtkContainerClass*) klass; - + +#ifndef NEW_GTK_CONSTRUCT_CODE parent_class = gtk_type_class (gtk_container_get_type ()); +#else + parent_class = gtk_type_class (GTK_TYPE_CONTAINER); +#endif widget_class->map = gtk_myfixed_map; +#ifndef NEW_GTK_CONSTRUCT_CODE widget_class->unmap = gtk_myfixed_unmap; +#endif widget_class->realize = gtk_myfixed_realize; widget_class->size_request = gtk_myfixed_size_request; widget_class->size_allocate = gtk_myfixed_size_allocate; @@ -88,15 +118,34 @@ gtk_myfixed_class_init (GtkMyFixedClass *klass) container_class->add = gtk_myfixed_add; container_class->remove = gtk_myfixed_remove; +#if (GTK_MINOR_VERSION == 1) + container_class->forall = gtk_myfixed_foreach; +#else container_class->foreach = gtk_myfixed_foreach; +#endif + +#ifdef NEW_GTK_CONSTRUCT_CODE + container_class->child_type = gtk_myfixed_child_type; +#endif } +#ifdef NEW_GTK_CONSTRUCT_CODE +static GtkType +gtk_myfixed_child_type (GtkContainer *container) +{ + return GTK_TYPE_WIDGET; +} +#endif + static void gtk_myfixed_init (GtkMyFixed *myfixed) { GTK_WIDGET_UNSET_FLAGS (myfixed, GTK_NO_WINDOW); - GTK_WIDGET_SET_FLAGS (myfixed, GTK_BASIC); +#ifndef NEW_GTK_CONSTRUCT_CODE + GTK_WIDGET_SET_FLAGS (myfixed, GTK_BASIC); +#endif + myfixed->children = NULL; } @@ -107,35 +156,9 @@ gtk_myfixed_new () myfixed = gtk_type_new (gtk_myfixed_get_type ()); - myfixed->scroll_offset_x = 0; - myfixed->scroll_offset_y = 0; - return GTK_WIDGET (myfixed); } -void -gtk_myfixed_set_offset (GtkMyFixed *myfixed, - gint16 x, - gint16 y) -{ - GtkWidget *widget; - - g_return_if_fail (myfixed != NULL); - g_return_if_fail (GTK_IS_MYFIXED (myfixed)); - - myfixed->scroll_offset_x = x; - myfixed->scroll_offset_y = y; - - widget = GTK_WIDGET( myfixed ); - - if (GTK_WIDGET_REALIZED( GTK_WIDGET(myfixed) )) - gdk_window_move_resize (widget->window, - widget->allocation.x + x, - widget->allocation.y + y, - 32000, - 32000); -} - void gtk_myfixed_put (GtkMyFixed *myfixed, GtkWidget *widget, @@ -150,8 +173,8 @@ gtk_myfixed_put (GtkMyFixed *myfixed, child_info = g_new (GtkMyFixedChild, 1); child_info->widget = widget; - child_info->x = x - myfixed->scroll_offset_x; - child_info->y = y - myfixed->scroll_offset_y; + child_info->x = x; + child_info->y = y; gtk_widget_set_parent (widget, GTK_WIDGET (myfixed)); @@ -188,8 +211,10 @@ gtk_myfixed_move (GtkMyFixed *myfixed, if (child->widget == widget) { - child->x = x - myfixed->scroll_offset_x; - child->y = y - myfixed->scroll_offset_y; + if ((child->x == x) && (child->y == y)) return; + + child->x = x; + child->y = y; if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed)) gtk_widget_queue_resize (GTK_WIDGET (myfixed)); @@ -226,6 +251,7 @@ gtk_myfixed_map (GtkWidget *widget) } } +#ifndef NEW_GTK_CONSTRUCT_CODE static void gtk_myfixed_unmap (GtkWidget *widget) { @@ -234,6 +260,7 @@ gtk_myfixed_unmap (GtkWidget *widget) GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED); } +#endif static void gtk_myfixed_realize (GtkWidget *widget) @@ -250,8 +277,8 @@ gtk_myfixed_realize (GtkWidget *widget) GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x + myfixed->scroll_offset_x; - attributes.y = widget->allocation.y + myfixed->scroll_offset_x; + attributes.x = widget->allocation.x; + attributes.y = widget->allocation.y; attributes.width = 32000; attributes.height = 32000; attributes.wclass = GDK_INPUT_OUTPUT; @@ -331,12 +358,7 @@ gtk_myfixed_size_allocate (GtkWidget *widget, widget->allocation = *allocation; if (GTK_WIDGET_REALIZED (widget)) - gdk_window_move_resize (widget->window, - allocation->x + myfixed->scroll_offset_x, - allocation->y + myfixed->scroll_offset_y, - 32000, - 32000 - ); + gdk_window_move_resize (widget->window, allocation->x, allocation->y, 32000, 32000 ); border_width = GTK_CONTAINER (myfixed)->border_width; @@ -485,6 +507,9 @@ gtk_myfixed_remove (GtkContainer *container, static void gtk_myfixed_foreach (GtkContainer *container, +#if (GTK_MINOR_VERSION == 1) + gboolean include_internals, +#endif GtkCallback callback, gpointer callback_data) {