simpler define handling

[wxWidgets.git] / src / gtk1 / win_gtk.c

diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c
index 27e2d156bb50c6ce4a580f9e999e70e88e94cfdf..c14edde8c745c3b94639439c95cfd350ac99cd08 100644 (file)
--- a/src/gtk1/win_gtk.c
+++ b/src/gtk1/win_gtk.c
@@ -1,20 +1,20 @@
 /* ///////////////////////////////////////////////////////////////////////////
 /* ///////////////////////////////////////////////////////////////////////////

-// Name:        win_gtk.c
-// Purpose:     Native GTK+ widget for wxWindows, based on GtkLayout and
+// Name:        src/gtk1/win_gtk.c
+// Purpose:     Native GTK+ widget for wxWidgets, based on GtkLayout and

 //              GtkFixed. It makes use of the gravity window property and
 //              therefore does not work with GTK 1.0.
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 //              GtkFixed. It makes use of the gravity window property and
 //              therefore does not work with GTK 1.0.
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////// */
 
 #ifdef VMS
 #define XCheckIfEvent XCHECKIFEVENT
 #endif
 
 /////////////////////////////////////////////////////////////////////////// */
 
 #ifdef VMS
 #define XCheckIfEvent XCHECKIFEVENT
 #endif
 

-#include "wx/setup.h"
-#include "wx/gtk/win_gtk.h"
+#include "wx/platform.h"
+#include "wx/gtk1/win_gtk.h"

 #include "gtk/gtksignal.h"
 #include "gtk/gtkprivate.h"
 #include "gdk/gdkx.h"
 #include "gtk/gtksignal.h"
 #include "gtk/gtkprivate.h"
 #include "gdk/gdkx.h"


@@ -23,8 +23,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
 extern "C" {
 #endif /* __cplusplus */
 

-#ifndef __WXGTK20__
-

 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>


@@ -32,7 +30,6 @@ extern "C" {
 #define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \
                           (y >= G_MINSHORT) && (y <= G_MAXSHORT))
 
 #define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \
                           (y >= G_MINSHORT) && (y <= G_MAXSHORT))
 

-#endif

 
 typedef struct _GtkPizzaAdjData  GtkPizzaAdjData;
 
 
 typedef struct _GtkPizzaAdjData  GtkPizzaAdjData;
 


@@ -54,12 +51,12 @@ static void gtk_pizza_size_request  (GtkWidget        *widget,
                                      GtkRequisition   *requisition);
 static void gtk_pizza_size_allocate (GtkWidget        *widget,
                                      GtkAllocation    *allocation);
                                      GtkRequisition   *requisition);
 static void gtk_pizza_size_allocate (GtkWidget        *widget,
                                      GtkAllocation    *allocation);

-#ifndef __WXGTK20__

 static void gtk_pizza_draw          (GtkWidget        *widget,
                                      GdkRectangle     *area);
 static void gtk_pizza_draw          (GtkWidget        *widget,
                                      GdkRectangle     *area);

-#endif /* __WXGTK20__ */

 static gint gtk_pizza_expose        (GtkWidget        *widget,
                                      GdkEventExpose   *event);
 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,
                                      GtkWidget        *widget);
 static void gtk_pizza_remove        (GtkContainer     *container,
 static void gtk_pizza_add           (GtkContainer     *container,
                                      GtkWidget        *widget);
 static void gtk_pizza_remove        (GtkContainer     *container,


@@ -68,13 +65,12 @@ static void gtk_pizza_forall        (GtkContainer     *container,
                                      gboolean          include_internals,
                                      GtkCallback       callback,
                                      gpointer          callback_data);
                                      gboolean          include_internals,
                                      GtkCallback       callback,
                                      gpointer          callback_data);

-                                     
+

 static void     gtk_pizza_allocate_child     (GtkPizza      *pizza,
                                               GtkPizzaChild *child);
 static void     gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
                                                       gpointer   cb_data);
 
 static void     gtk_pizza_allocate_child     (GtkPizza      *pizza,
                                               GtkPizzaChild *child);
 static void     gtk_pizza_adjust_allocations_recurse (GtkWidget *widget,
                                                       gpointer   cb_data);
 

-#ifndef __WXGTK20__

 static void     gtk_pizza_position_child     (GtkPizza      *pizza,
                                               GtkPizzaChild *child);
 static void     gtk_pizza_position_children  (GtkPizza      *pizza);
 static void     gtk_pizza_position_child     (GtkPizza      *pizza,
                                               GtkPizzaChild *child);
 static void     gtk_pizza_position_children  (GtkPizza      *pizza);


@@ -85,7 +81,6 @@ static GdkFilterReturn gtk_pizza_filter      (GdkXEvent      *gdk_xevent,
 static GdkFilterReturn gtk_pizza_main_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);
 
 
 static GtkType gtk_pizza_child_type (GtkContainer     *container);
 


@@ -94,37 +89,17 @@ static void  gtk_pizza_scroll_set_adjustments (GtkPizza      *pizza,
                                                GtkAdjustment *vadj);
 
 
                                                GtkAdjustment *vadj);
 
 

-#ifdef __WXGTK20__
-       GtkContainerClass *pizza_parent_class = NULL;
-#else

 static GtkContainerClass *pizza_parent_class = NULL;
 static GtkContainerClass *pizza_parent_class = NULL;

-#endif

 
 static gboolean gravity_works;
 
 
 static gboolean gravity_works;
 

-guint
+GtkType

 gtk_pizza_get_type ()
 {
 gtk_pizza_get_type ()
 {

-    static guint pizza_type = 0;
+    static GtkType pizza_type = 0;

 
     if (!pizza_type)
     {
 
     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",
         GtkTypeInfo pizza_info =
         {
             "GtkPizza",


@@ -137,7 +112,6 @@ gtk_pizza_get_type ()
             (GtkClassInitFunc) NULL,
         };
         pizza_type = gtk_type_unique (gtk_container_get_type (), &pizza_info);
             (GtkClassInitFunc) NULL,
         };
         pizza_type = gtk_type_unique (gtk_container_get_type (), &pizza_info);

-#endif

     }
 
     return pizza_type;
     }
 
     return pizza_type;


@@ -160,10 +134,9 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
     widget_class->unrealize = gtk_pizza_unrealize;
     widget_class->size_request = gtk_pizza_size_request;
     widget_class->size_allocate = gtk_pizza_size_allocate;
     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;
     widget_class->draw = gtk_pizza_draw;

-#endif

     widget_class->expose_event = gtk_pizza_expose;
     widget_class->expose_event = gtk_pizza_expose;

+    widget_class->style_set = gtk_pizza_style_set;

 
     container_class->add = gtk_pizza_add;
     container_class->remove = gtk_pizza_remove;
 
     container_class->add = gtk_pizza_add;
     container_class->remove = gtk_pizza_remove;


@@ -176,11 +149,7 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
     widget_class->set_scroll_adjustments_signal =
     gtk_signal_new ("set_scroll_adjustments",
                     GTK_RUN_LAST,
     widget_class->set_scroll_adjustments_signal =
     gtk_signal_new ("set_scroll_adjustments",
                     GTK_RUN_LAST,

-#ifdef __WXGTK20__
-                    GTK_CLASS_TYPE(object_class),
-#else

                     object_class->type,
                     object_class->type,

-#endif

                     GTK_SIGNAL_OFFSET (GtkPizzaClass, set_scroll_adjustments),
                     gtk_marshal_NONE__POINTER_POINTER,
                     GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
                     GTK_SIGNAL_OFFSET (GtkPizzaClass, set_scroll_adjustments),
                     gtk_marshal_NONE__POINTER_POINTER,
                     GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);


@@ -310,15 +279,13 @@ gtk_pizza_put (GtkPizza   *pizza,
 
     pizza->children = g_list_append (pizza->children, child_info);
 
 
     pizza->children = g_list_append (pizza->children, child_info);
 

-    gtk_widget_set_parent (widget, GTK_WIDGET (pizza));
-

     if (GTK_WIDGET_REALIZED (pizza))
       gtk_widget_set_parent_window (widget, pizza->bin_window);
 
     if (GTK_WIDGET_REALIZED (pizza))
       gtk_widget_set_parent_window (widget, pizza->bin_window);
 

-#ifndef __WXGTK20__ /* FIXME? */
+    gtk_widget_set_parent (widget, GTK_WIDGET (pizza));
+

     if (!IS_ONSCREEN (x, y))
        GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN);
     if (!IS_ONSCREEN (x, y))
        GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN);

-#endif

 
     gtk_widget_set_usize (widget, width, height);
 }
 
     gtk_widget_set_usize (widget, width, height);
 }


@@ -349,7 +316,7 @@ gtk_pizza_move (GtkPizza     *pizza,
 
             child->x = x;
             child->y = y;
 
             child->x = x;
             child->y = y;

-            
+

             if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
                 gtk_widget_queue_resize (widget);
             break;
             if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
                 gtk_widget_queue_resize (widget);
             break;


@@ -484,11 +451,7 @@ gtk_pizza_map (GtkWidget *widget)
 
         if ( GTK_WIDGET_VISIBLE (child->widget) &&
             !GTK_WIDGET_MAPPED (child->widget) &&
 
         if ( GTK_WIDGET_VISIBLE (child->widget) &&
             !GTK_WIDGET_MAPPED (child->widget) &&

-#ifdef __WXGTK20__
-            TRUE)
-#else

             !GTK_WIDGET_IS_OFFSCREEN (child->widget))
             !GTK_WIDGET_IS_OFFSCREEN (child->widget))

-#endif

         {
             gtk_widget_map (child->widget);
         }
         {
             gtk_widget_map (child->widget);
         }


@@ -563,9 +526,6 @@ gtk_pizza_realize (GtkWidget *widget)
 
     attributes.event_mask = gtk_widget_get_events (widget);
     attributes.event_mask |= GDK_EXPOSURE_MASK              |
 
     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_POINTER_MOTION_MASK        |
                              GDK_POINTER_MOTION_HINT_MASK   |
                              GDK_BUTTON_MOTION_MASK         |


@@ -587,17 +547,15 @@ gtk_pizza_realize (GtkWidget *widget)
     widget->style = gtk_style_attach (widget->style, widget->window);
     gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
     gtk_style_set_background (widget->style, pizza->bin_window, GTK_STATE_NORMAL );
     widget->style = gtk_style_attach (widget->style, widget->window);
     gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
     gtk_style_set_background (widget->style, pizza->bin_window, GTK_STATE_NORMAL );

-    
+

 /*
     gdk_window_set_back_pixmap( widget->window, NULL, FALSE );
     gdk_window_set_back_pixmap( pizza->bin_window, NULL, FALSE );
 */
 
 /*
     gdk_window_set_back_pixmap( widget->window, NULL, FALSE );
     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);
     /* 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);
 
     /* we NEED gravity or we'll give up */
     gravity_works = gdk_window_set_static_gravities (pizza->bin_window, TRUE);


@@ -707,15 +665,11 @@ gtk_pizza_size_allocate (GtkWidget     *widget,
         child = children->data;
         children = children->next;
 
         child = children->data;
         children = children->next;
 

-#ifndef __WXGTK20__

         gtk_pizza_position_child (pizza, child);
         gtk_pizza_position_child (pizza, child);

-#endif

         gtk_pizza_allocate_child (pizza, child);
     }
 }
 
         gtk_pizza_allocate_child (pizza, child);
     }
 }
 

-#ifndef __WXGTK20__
-

 static void
 gtk_pizza_draw (GtkWidget    *widget,
                 GdkRectangle *area)
 static void
 gtk_pizza_draw (GtkWidget    *widget,
                 GdkRectangle *area)


@@ -752,18 +706,14 @@ gtk_pizza_draw (GtkWidget    *widget,
     }
 }
 
     }
 }
 

-#endif /* __WXGTK20__ */
-

 static gint
 gtk_pizza_expose (GtkWidget      *widget,
                   GdkEventExpose *event)
 {
     GtkPizza *pizza;
 static gint
 gtk_pizza_expose (GtkWidget      *widget,
                   GdkEventExpose *event)
 {
     GtkPizza *pizza;

-#ifndef __WXGTK20__

     GtkPizzaChild *child;
     GdkEventExpose child_event;
     GList *children;
     GtkPizzaChild *child;
     GdkEventExpose child_event;
     GList *children;

-#endif

 
     g_return_val_if_fail (widget != NULL, FALSE);
     g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE);
 
     g_return_val_if_fail (widget != NULL, FALSE);
     g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE);


@@ -778,14 +728,6 @@ gtk_pizza_expose (GtkWidget      *widget,
     if (pizza->external_expose)
         return FALSE;
 
     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)
     {
     children = pizza->children;
     while (children)
     {


@@ -801,10 +743,20 @@ gtk_pizza_expose (GtkWidget      *widget,
             gtk_widget_event (child->widget, (GdkEvent*) &child_event);
         }
     }
             gtk_widget_event (child->widget, (GdkEvent*) &child_event);
         }
     }

-    
+

     return TRUE;
     return TRUE;

-    
-#endif
+}
+
+static void
+gtk_pizza_style_set(GtkWidget *widget, GtkStyle  *previous_style)
+{
+    if (GTK_WIDGET_REALIZED(widget))
+    {
+        gtk_style_set_background(widget->style, widget->window, GTK_STATE_NORMAL);
+        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);

 }
 
 static void
 }
 
 static void


@@ -851,9 +803,7 @@ gtk_pizza_remove (GtkContainer *container,
             /* security checks */
             g_return_if_fail (GTK_IS_WIDGET (widget));
 
             /* security checks */
             g_return_if_fail (GTK_IS_WIDGET (widget));
 

-#ifndef __WXGTK20__

             GTK_PRIVATE_UNSET_FLAG (widget, GTK_IS_OFFSCREEN);
             GTK_PRIVATE_UNSET_FLAG (widget, GTK_IS_OFFSCREEN);

-#endif

 
             break;
         }
 
             break;
         }


@@ -951,7 +901,6 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza,
     }
 }
 
     }
 }
 

-#ifndef __WXGTK20__

 static void
 gtk_pizza_position_child (GtkPizza      *pizza,
                           GtkPizzaChild *child)
 static void
 gtk_pizza_position_child (GtkPizza      *pizza,
                           GtkPizzaChild *child)


@@ -1012,7 +961,6 @@ gtk_pizza_expose_predicate (Display *display,
     else
         return False;
 }
     else
         return False;
 }

-#endif /* __WXGTK20__ */

 
 /* This is the main routine to do the scrolling. Scrolling is
  * done by "Guffaw" scrolling, as in the Mozilla XFE, with
 
 /* This is the main routine to do the scrolling. Scrolling is
  * done by "Guffaw" scrolling, as in the Mozilla XFE, with


@@ -1029,15 +977,6 @@ gtk_pizza_expose_predicate (Display *display,
 void
 gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
 {
 void
 gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
 {

-#ifdef __WXGTK20__
-    pizza->xoffset += dx;
-    pizza->yoffset += dy;
-
-    gtk_pizza_adjust_allocations (pizza, -dx, -dy);
-
-    if (pizza->bin_window)
-        gdk_window_scroll( pizza->bin_window, -dx, -dy );
-#else

     GtkWidget *widget;
     XEvent xevent;
     XID win;
     GtkWidget *widget;
     XEvent xevent;
     XID win;


@@ -1169,11 +1108,9 @@ gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
             }
         }
     }
             }
         }
     }

-#endif /* __WXGTK20__ */

 }
 
 
 }
 
 

-#ifndef __WXGTK20__

 /* The main event filter. Actually, we probably don't really need
  * to install this as a filter at all, since we are calling it
  * directly above in the expose-handling hack. But in case scrollbars
 /* The main event filter. Actually, we probably don't really need
  * to install this as a filter at all, since we are calling it
  * directly above in the expose-handling hack. But in case scrollbars


@@ -1261,10 +1198,7 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent,
 
     return GDK_FILTER_CONTINUE;
 }
 
     return GDK_FILTER_CONTINUE;
 }

-#endif /* __WXGTK20__ */
-

 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

-