removed tabs; minor cosmetic cleanup

[wxWidgets.git] / include / wx / gtk1 / win_gtk.h

diff --git a/include/wx/gtk1/win_gtk.h b/include/wx/gtk1/win_gtk.h
index 6bc8e3ea11246e23569fee6b77278dcd33f72bf5..6bd073219b9e4ddab27118131436187ab0f6fc24 100644 (file)
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -1,75 +1,135 @@
-/////////////////////////////////////////////////////////////////////////////
+/* ///////////////////////////////////////////////////////////////////////////

 // Name:        win_gtk.h
 // Name:        win_gtk.h

-// Purpose:     wxWindows's GTK base widget
+// Purpose:     wxWindows's GTK base widget = GtkPizza

 // 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

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

 
 
 
 

-#ifndef __GTK_MYFIXED_H__
-#define __GTK_MYFIXED_H__
+#ifndef __GTK_PIZZA_H__
+#define __GTK_PIZZA_H__

 
 

+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */

 
 #include <gdk/gdk.h>
 
 #include <gdk/gdk.h>

+#include <gdk/gdkx.h>

 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkcontainer.h>

+#include <gtk/gtkadjustment.h>
+#ifndef __WXGTK20__
+#include <gtk/gtkfeatures.h>
+#endif

 
 

+#define GTK_PIZZA(obj)          GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza)
+#define GTK_PIZZA_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_pizza_get_type (), GtkPizzaClass)
+#define GTK_IS_PIZZA(obj)       GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())

 
 

-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+/* Shadow types */
+typedef enum
+{
+    GTK_MYSHADOW_NONE,
+    GTK_MYSHADOW_THIN,
+    GTK_MYSHADOW_IN,
+    GTK_MYSHADOW_OUT
+} GtkMyShadowType;

 
 

+typedef struct _GtkPizzaChild    GtkPizzaChild;
+typedef struct _GtkPizza        GtkPizza;
+typedef struct _GtkPizzaClass   GtkPizzaClass;

 
 

-#define GTK_MYFIXED(obj)          GTK_CHECK_CAST (obj, gtk_myfixed_get_type (), GtkMyFixed)
-#define GTK_MYFIXED_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_myfixed_get_type (), GtkMyFixedClass)
-#define GTK_IS_MYFIXED(obj)       GTK_CHECK_TYPE (obj, gtk_myfixed_get_type ())
+struct _GtkPizzaChild
+{
+    GtkWidget *widget;
+    gint x;
+    gint y;
+    gint width;
+    gint height;
+};

 
 

+struct _GtkPizza
+{
+    GtkContainer container;
+    GList *children;
+    GtkMyShadowType shadow_type;
+  
+    guint width;
+    guint height;

 
 

-typedef struct _GtkMyFixed        GtkMyFixed;
-typedef struct _GtkMyFixedClass   GtkMyFixedClass;
-typedef struct _GtkMyFixedChild   GtkMyFixedChild;
+    guint xoffset;
+    guint yoffset;

 
 

-struct _GtkMyFixed
-{
-  GtkContainer container;
+    GdkWindow *bin_window;

 
 

-  GList *children;
+    GdkVisibilityState visibility;
+    gulong configure_serial;
+    gint scroll_x;
+    gint scroll_y;

   
   

-  gint16  scroll_offset_x;
-  gint16  scroll_offset_y;
+    gboolean clear_on_draw;
+    gboolean use_filter;
+    gboolean external_expose;

 };
 
 };
 

-struct _GtkMyFixedClass
+struct _GtkPizzaClass

 {
   GtkContainerClass parent_class;
 {
   GtkContainerClass parent_class;

-};

 
 

-struct _GtkMyFixedChild
-{
-  GtkWidget *widget;
-  gint16 x;
-  gint16 y;
+  void  (*set_scroll_adjustments)   (GtkPizza     *pizza,
+                                    GtkAdjustment  *hadjustment,
+                                    GtkAdjustment  *vadjustment);

 };
 
 };
 

-guint      gtk_myfixed_get_type        (void);
-GtkWidget* gtk_myfixed_new             (void);
-void       gtk_myfixed_set_offset      (GtkMyFixed     *myfixed,
-                                        gint16         x,
-                                        gint16         y);
-void       gtk_myfixed_put             (GtkMyFixed     *myfixed,
-                                        GtkWidget      *widget,
-                                        gint16         x,
-                                        gint16         y);
-void       gtk_myfixed_move            (GtkMyFixed     *myfixed,
-                                        GtkWidget      *widget,
-                                        gint16         x,
-                                        gint16         y);
-
+guint      gtk_pizza_get_type        (void);
+GtkWidget* gtk_pizza_new             (void);
+
+void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
+                                                     GtkMyShadowType    type);
+                                       
+void       gtk_pizza_set_clear       (GtkPizza          *pizza,
+                                      gboolean           clear);               
+                                       
+void       gtk_pizza_set_filter      (GtkPizza          *pizza,
+                                      gboolean           use);         
+                                       
+void       gtk_pizza_set_external    (GtkPizza          *pizza,
+                                      gboolean           expose);              
+                                       
+void       gtk_pizza_scroll          (GtkPizza          *pizza,        
+                                      gint               dx,
+                                      gint               dy);
+
+gint       gtk_pizza_child_resized   (GtkPizza          *pizza,
+                                      GtkWidget         *widget);
+                                       
+void       gtk_pizza_put             (GtkPizza          *pizza,
+                                      GtkWidget         *widget,
+                                      gint               x,
+                                      gint               y,
+                                                         gint               width,
+                                                         gint               height);
+
+void       gtk_pizza_move            (GtkPizza          *pizza,
+                                      GtkWidget         *widget,
+                                      gint               x,
+                                      gint               y );
+                                       
+void       gtk_pizza_resize          (GtkPizza          *pizza,
+                                      GtkWidget         *widget,
+                                      gint               width,
+                                      gint               height );
+                                       
+void       gtk_pizza_set_size        (GtkPizza          *pizza,
+                                      GtkWidget         *widget,
+                                      gint               x,
+                                      gint               y,
+                                      gint               width,
+                                      gint               height);

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

-#endif /* __GTK_MYFIXED_H__ */
+#endif /* __GTK_PIZZA_H__ */