Tought Systemettings that sysfont has 12 pts

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

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index e823bfa4a86538bb1cc01509fb1067f3853d2ad6..f6d9b57995dbf00878477034b333f67ed5b64d71 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -1,14 +1,14 @@
-/////////////////////////////////////////////////////////////////////////////
-// 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
 // Licence:    wxWindows licence

-/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////// */

 
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/gtk/win_gtk.h"

+#include <gtk/gtkfeatures.h>

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


@@ -34,6 +34,9 @@ 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 == 1)
+                                    gboolean         include_internals,
+#endif

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


@@ -88,7 +91,11 @@ 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 == 1)
+  container_class->forall = gtk_myfixed_foreach;
+#else

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

+#endif

 }
 
 static void
 }
 
 static void


@@ -107,35 +114,9 @@ gtk_myfixed_new ()
 
   myfixed = gtk_type_new (gtk_myfixed_get_type ());
   
 
   myfixed = gtk_type_new (gtk_myfixed_get_type ());
   

-  myfixed->scroll_offset_x = 0;
-  myfixed->scroll_offset_y = 0;
-  

   return GTK_WIDGET (myfixed);
 }
 
   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,
 void
 gtk_myfixed_put (GtkMyFixed       *myfixed,
                GtkWidget      *widget,


@@ -150,8 +131,8 @@ gtk_myfixed_put (GtkMyFixed       *myfixed,
 
   child_info = g_new (GtkMyFixedChild, 1);
   child_info->widget = widget;
 
   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));
 
   
   gtk_widget_set_parent (widget, GTK_WIDGET (myfixed));
 


@@ -188,8 +169,8 @@ gtk_myfixed_move (GtkMyFixed       *myfixed,
 
       if (child->widget == widget)
         {
 
       if (child->widget == widget)
         {

-          child->x = x - myfixed->scroll_offset_x;
-          child->y = y - myfixed->scroll_offset_y;
+          child->x = x;
+          child->y = y;

 
           if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
             gtk_widget_queue_resize (GTK_WIDGET (myfixed));
 
           if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
             gtk_widget_queue_resize (GTK_WIDGET (myfixed));


@@ -250,8 +231,8 @@ 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;

-  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;
   attributes.width = 32000;
   attributes.height = 32000;
   attributes.wclass = GDK_INPUT_OUTPUT;


@@ -331,12 +312,7 @@ gtk_myfixed_size_allocate (GtkWidget     *widget,
 
   widget->allocation = *allocation;
   if (GTK_WIDGET_REALIZED (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;
   
 
   border_width = GTK_CONTAINER (myfixed)->border_width;
   


@@ -485,6 +461,9 @@ gtk_myfixed_remove (GtkContainer *container,
 
 static void
 gtk_myfixed_foreach (GtkContainer *container,
 
 static void
 gtk_myfixed_foreach (GtkContainer *container,

+#if (GTK_MINOR_VERSION == 1)
+                  gboolean      include_internals,
+#endif

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