no message

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

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 5f6245a89111adcd4e8773b84c69d62d14b464b0..3a999cdeffb87bd00c7f79f2c2d27b26a7f64e73 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -1,4 +1,4 @@
-/////////////////////////////////////////////////////////////////////////////
+/* ///////////////////////////////////////////////////////////////////////////

 // Name:        wx_gtk.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        wx_gtk.h
 // Purpose:
 // Author:      Robert Roebling


@@ -6,9 +6,10 @@
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:    wxWindows licence
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // 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 +35,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 +92,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 +115,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,


@@ -152,7 +134,7 @@ 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;

-
+  

   gtk_widget_set_parent (widget, GTK_WIDGET (myfixed));
 
   myfixed->children = g_list_append (myfixed->children, child_info); 
   gtk_widget_set_parent (widget, GTK_WIDGET (myfixed));
 
   myfixed->children = g_list_append (myfixed->children, child_info); 


@@ -238,12 +220,15 @@ gtk_myfixed_unmap (GtkWidget *widget)
 static void
 gtk_myfixed_realize (GtkWidget *widget)
 {
 static void
 gtk_myfixed_realize (GtkWidget *widget)
 {

+  GtkMyFixed *myfixed;

   GdkWindowAttr attributes;
   gint attributes_mask;
 
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_MYFIXED (widget));
 
   GdkWindowAttr attributes;
   gint attributes_mask;
 
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_MYFIXED (widget));
 

+  myfixed = GTK_MYFIXED (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;


@@ -328,12 +313,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;
   


@@ -482,6 +462,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)
 {