Minor fixes, should be ok now.

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

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 4164200ac1bb30236cfcf067a3582e78ea32c365..cd9ed0177e0065f30fcdf6871477d63a9e6ef2ad 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -1,14 +1,15 @@
 /* ///////////////////////////////////////////////////////////////////////////
 /* ///////////////////////////////////////////////////////////////////////////

-// Name:        wx_gtk.h
-// Purpose:
+// Name:        win_gtk.c
+// Purpose:     native GTK+ widget for wxWindows

 // Author:      Robert Roebling
 // 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"
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
 #include "wx/gtk/win_gtk.h"

+#include "gtk/gtksignal.h"
+#include "gtk/gtknotebook.h"

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -17,7 +18,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);
 static void gtk_myfixed_class_init    (GtkMyFixedClass    *klass);
 static void gtk_myfixed_init          (GtkMyFixed         *myfixed);
 static void gtk_myfixed_map           (GtkWidget        *widget);

+#if (GTK_MINOR_VERSION == 0)

 static void gtk_myfixed_unmap         (GtkWidget        *widget);
 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);
 static void gtk_myfixed_realize       (GtkWidget        *widget);
 static void gtk_myfixed_size_request  (GtkWidget        *widget,
                                     GtkRequisition   *requisition);


@@ -34,12 +37,24 @@ static void gtk_myfixed_add           (GtkContainer     *container,
 static void gtk_myfixed_remove        (GtkContainer     *container,
                                     GtkWidget        *widget);
 static void gtk_myfixed_foreach       (GtkContainer     *container,
 static void gtk_myfixed_remove        (GtkContainer     *container,
                                     GtkWidget        *widget);
 static void gtk_myfixed_foreach       (GtkContainer     *container,

+#if (GTK_MINOR_VERSION > 0)
+                                    gboolean         include_internals,
+#endif

                                     GtkCallback      callback,
                                     gpointer         callback_data);
                                     GtkCallback      callback,
                                     gpointer         callback_data);

+#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 ()
 
 guint
 gtk_myfixed_get_type ()


@@ -55,8 +70,14 @@ gtk_myfixed_get_type ()
        sizeof (GtkMyFixedClass),
        (GtkClassInitFunc) gtk_myfixed_class_init,
        (GtkObjectInitFunc) gtk_myfixed_init,
        sizeof (GtkMyFixedClass),
        (GtkClassInitFunc) gtk_myfixed_class_init,
        (GtkObjectInitFunc) gtk_myfixed_init,

-       (GtkArgSetFunc) NULL,
+#if (GTK_MINOR_VERSION > 0)
+       /* reserved_1 */ NULL,
+        /* reserved_2 */ NULL,
+        (GtkClassInitFunc) NULL,
+#else
+        (GtkArgSetFunc) NULL,

         (GtkArgGetFunc) NULL,
         (GtkArgGetFunc) NULL,

+#endif

       };
 
       myfixed_type = gtk_type_unique (gtk_container_get_type (), &myfixed_info);
       };
 
       myfixed_type = gtk_type_unique (gtk_container_get_type (), &myfixed_info);


@@ -75,11 +96,17 @@ gtk_myfixed_class_init (GtkMyFixedClass *klass)
   object_class = (GtkObjectClass*) klass;
   widget_class = (GtkWidgetClass*) klass;
   container_class = (GtkContainerClass*) klass;
   object_class = (GtkObjectClass*) klass;
   widget_class = (GtkWidgetClass*) klass;
   container_class = (GtkContainerClass*) klass;

-
+  
+#if (GTK_MINOR_VERSION > 0)
+  parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
+#else

   parent_class = gtk_type_class (gtk_container_get_type ());
   parent_class = gtk_type_class (gtk_container_get_type ());

+#endif

 
   widget_class->map = gtk_myfixed_map;
 
   widget_class->map = gtk_myfixed_map;

+#if (GTK_MINOR_VERSION == 0)

   widget_class->unmap = gtk_myfixed_unmap;
   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;
   widget_class->realize = gtk_myfixed_realize;
   widget_class->size_request = gtk_myfixed_size_request;
   widget_class->size_allocate = gtk_myfixed_size_allocate;


@@ -88,15 +115,50 @@ gtk_myfixed_class_init (GtkMyFixedClass *klass)
 
   container_class->add = gtk_myfixed_add;
   container_class->remove = gtk_myfixed_remove;
 
   container_class->add = gtk_myfixed_add;
   container_class->remove = gtk_myfixed_remove;

+#if (GTK_MINOR_VERSION > 0)
+  container_class->forall = gtk_myfixed_foreach;
+#else

   container_class->foreach = gtk_myfixed_foreach;
   container_class->foreach = gtk_myfixed_foreach;

+#endif
+
+#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

 }
 
 }
 

+#if (GTK_MINOR_VERSION > 0)
+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);
 static void
 gtk_myfixed_init (GtkMyFixed *myfixed)
 {
   GTK_WIDGET_UNSET_FLAGS (myfixed, GTK_NO_WINDOW);

-  GTK_WIDGET_SET_FLAGS (myfixed, GTK_BASIC);

   
   

+#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;
 }
 
   myfixed->children = NULL;
 }
 


@@ -110,11 +172,41 @@ gtk_myfixed_new ()
   return GTK_WIDGET (myfixed);
 }
 
   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
 void

-gtk_myfixed_put (GtkMyFixed       *myfixed,
-               GtkWidget      *widget,
-               gint16         x,
-               gint16         y)
+gtk_myfixed_put (GtkMyFixed   *myfixed,
+                 GtkWidget      *widget,
+                 gint16         x,
+                 gint16         y,
+                gint16         width,
+                gint16         height)

 {
   GtkMyFixedChild *child_info;
 
 {
   GtkMyFixedChild *child_info;
 


@@ -126,6 +218,8 @@ gtk_myfixed_put (GtkMyFixed       *myfixed,
   child_info->widget = widget;
   child_info->x = x;
   child_info->y = y;
   child_info->widget = widget;
   child_info->x = x;
   child_info->y = y;

+  child_info->width = width;
+  child_info->height = height;

   
   gtk_widget_set_parent (widget, GTK_WIDGET (myfixed));
 
   
   gtk_widget_set_parent (widget, GTK_WIDGET (myfixed));
 


@@ -142,10 +236,10 @@ gtk_myfixed_put (GtkMyFixed       *myfixed,
 }
 
 void
 }
 
 void

-gtk_myfixed_move (GtkMyFixed       *myfixed,
-                GtkWidget      *widget,
-                gint16         x,
-                gint16         y)
+gtk_myfixed_move (GtkMyFixed     *myfixed,
+                  GtkWidget      *widget,
+                  gint16         x,
+                  gint16         y)

 {
   GtkMyFixedChild *child;
   GList *children;
 {
   GtkMyFixedChild *child;
   GList *children;


@@ -159,14 +253,91 @@ gtk_myfixed_move (GtkMyFixed       *myfixed,
     {
       child = children->data;
       children = children->next;
     {
       child = children->data;
       children = children->next;

+      
+      if (child->widget == widget)
+        {
+           gtk_myfixed_set_size( myfixed, widget, x, y, child->width, child->height );
+          break;
+       }
+    }
+}
+
+void
+gtk_myfixed_resize (GtkMyFixed     *myfixed,
+                    GtkWidget      *widget,
+                   gint16         width,
+                   gint16         height)
+{
+  GtkMyFixedChild *child;
+  GList *children;

 
 

+  g_return_if_fail (myfixed != NULL);
+  g_return_if_fail (GTK_IS_MYFIXED (myfixed));
+  g_return_if_fail (widget != NULL);
+
+  children = myfixed->children;
+  while (children)
+    {
+      child = children->data;
+      children = children->next;
+      

       if (child->widget == widget)
         {
       if (child->widget == widget)
         {

+           gtk_myfixed_set_size( myfixed, widget, child->x, child->y, width, height );
+          break;
+       }
+    }
+}
+
+void
+gtk_myfixed_set_size (GtkMyFixed     *myfixed,
+                      GtkWidget      *widget,
+                      gint16         x,
+                      gint16         y,
+                     gint16         width,
+                     gint16         height)
+{
+  GtkMyFixedChild *child;
+  GList *children;
+  GtkAllocation child_allocation;
+
+  g_return_if_fail (myfixed != NULL);
+  g_return_if_fail (GTK_IS_MYFIXED (myfixed));
+  g_return_if_fail (widget != NULL);
+
+  children = myfixed->children;
+  while (children)
+    {
+      child = children->data;
+      children = children->next;
+
+      if (child->widget == widget)
+        {
+         if ((child->x == x) && 
+             (child->y == y) &&
+             (child->width == width) && 
+             (child->height == height)) return;
+         

           child->x = x;
           child->y = y;
           child->x = x;
           child->y = y;

+          child->width = width;
+          child->height = height;

 
           if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
 
           if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))

-            gtk_widget_queue_resize (GTK_WIDGET (myfixed));
+         {
+             if ((child->width > 1) && (child->height > 1) && (GTK_WIDGET_REALIZED(widget)))
+            {
+                child_allocation.x = child->x;
+                child_allocation.y = child->y;
+                child_allocation.width = child->width;
+                child_allocation.height = child->height;
+                gtk_widget_size_allocate (widget, &child_allocation);
+             } 
+            else 
+            {
+                gtk_widget_queue_resize (GTK_WIDGET (myfixed));
+            }
+         }

 
           break;
         }
 
           break;
         }


@@ -200,6 +371,7 @@ gtk_myfixed_map (GtkWidget *widget)
     }
 }
 
     }
 }
 

+#if (GTK_MINOR_VERSION == 0)

 static void
 gtk_myfixed_unmap (GtkWidget *widget)
 {
 static void
 gtk_myfixed_unmap (GtkWidget *widget)
 {


@@ -208,6 +380,7 @@ gtk_myfixed_unmap (GtkWidget *widget)
 
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
 }
 
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
 }

+#endif

 
 static void
 gtk_myfixed_realize (GtkWidget *widget)
 
 static void
 gtk_myfixed_realize (GtkWidget *widget)


@@ -224,10 +397,29 @@ gtk_myfixed_realize (GtkWidget *widget)
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
   attributes.window_type = GDK_WINDOW_CHILD;
   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;
   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.wclass = GDK_INPUT_OUTPUT;
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);


@@ -235,6 +427,7 @@ gtk_myfixed_realize (GtkWidget *widget)
   attributes.event_mask |= 
   GDK_EXPOSURE_MASK    |
   GDK_POINTER_MOTION_MASK      |
   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      |
   GDK_BUTTON_MOTION_MASK       |
   GDK_BUTTON1_MOTION_MASK      |
   GDK_BUTTON2_MOTION_MASK      |


@@ -271,8 +464,8 @@ gtk_myfixed_size_request (GtkWidget      *widget,
 
   myfixed = GTK_MYFIXED (widget);
   
 
   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)
 
   children = myfixed->children;
   while (children)


@@ -289,38 +482,58 @@ gtk_myfixed_size_request (GtkWidget      *widget,
 
 static void
 gtk_myfixed_size_allocate (GtkWidget     *widget,
 
 static void
 gtk_myfixed_size_allocate (GtkWidget     *widget,

-                        GtkAllocation *allocation)
+                          GtkAllocation *allocation)

 {
   GtkMyFixed *myfixed;
 {
   GtkMyFixed *myfixed;

+  gint border;

   GtkMyFixedChild *child;
   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);
 
   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))
   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;
   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.width = child->widget->requisition.width;
-         child_allocation.height = child->widget->requisition.height;
+         child_allocation.x = child->x;
+         child_allocation.y = child->y;
+         child_allocation.width = child->width;
+         child_allocation.height = child->height;

          gtk_widget_size_allocate (child->widget, &child_allocation);
        }
     }
          gtk_widget_size_allocate (child->widget, &child_allocation);
        }
     }


@@ -328,7 +541,7 @@ gtk_myfixed_size_allocate (GtkWidget     *widget,
 
 static void
 gtk_myfixed_paint (GtkWidget    *widget,
 
 static void
 gtk_myfixed_paint (GtkWidget    *widget,

-                GdkRectangle *area)
+                  GdkRectangle *area)

 {
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_MYFIXED (widget));
 {
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_MYFIXED (widget));


@@ -342,7 +555,7 @@ gtk_myfixed_paint (GtkWidget    *widget,
 
 static void
 gtk_myfixed_draw (GtkWidget    *widget,
 
 static void
 gtk_myfixed_draw (GtkWidget    *widget,

-               GdkRectangle *area)
+                 GdkRectangle *area)

 {
   GtkMyFixed *myfixed;
   GtkMyFixedChild *child;
 {
   GtkMyFixed *myfixed;
   GtkMyFixedChild *child;


@@ -371,7 +584,7 @@ gtk_myfixed_draw (GtkWidget    *widget,
 
 static gint
 gtk_myfixed_expose (GtkWidget      *widget,
 
 static gint
 gtk_myfixed_expose (GtkWidget      *widget,

-                 GdkEventExpose *event)
+                   GdkEventExpose *event)

 {
   GtkMyFixed *myfixed;
   GtkMyFixedChild *child;
 {
   GtkMyFixed *myfixed;
   GtkMyFixedChild *child;


@@ -412,7 +625,7 @@ gtk_myfixed_add (GtkContainer *container,
   g_return_if_fail (GTK_IS_MYFIXED (container));
   g_return_if_fail (widget != NULL);
 
   g_return_if_fail (GTK_IS_MYFIXED (container));
   g_return_if_fail (widget != NULL);
 

-  gtk_myfixed_put (GTK_MYFIXED (container), widget, 0, 0);
+  gtk_myfixed_put (GTK_MYFIXED (container), widget, 0, 0, 20, 20 );

 }
 
 static void
 }
 
 static void


@@ -454,6 +667,9 @@ gtk_myfixed_remove (GtkContainer *container,
 
 static void
 gtk_myfixed_foreach (GtkContainer *container,
 
 static void
 gtk_myfixed_foreach (GtkContainer *container,

+#if (GTK_MINOR_VERSION > 0)
+                  gboolean      include_internals,
+#endif

                   GtkCallback   callback,
                   gpointer      callback_data)
 {
                   GtkCallback   callback,
                   gpointer      callback_data)
 {