correct access for virtuals

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

diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
index 81f0ecebb94aa20949908ad8e61ed8a05265896f..1bfeaa799ea61b249834db98ff34a1345c316875 100644 (file)
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -15,70 +15,24 @@
 extern "C" {
 #endif /* __cplusplus */
 
 extern "C" {
 #endif /* __cplusplus */
 

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

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

-#include <gtk/gtkadjustment.h>

 
 #include "wx/dlimpexp.h"
 
 #define GTK_PIZZA(obj)          GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza)
 
 #include "wx/dlimpexp.h"
 
 #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 ())
 
 #define GTK_IS_PIZZA(obj)       GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())
 

-/* 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 _GtkPizza        GtkPizza;

-typedef struct _GtkPizzaClass   GtkPizzaClass;
-
-struct _GtkPizzaChild
-{
-    GtkWidget *widget;
-    gint x;
-    gint y;
-    gint width;
-    gint height;
-};

 
 struct _GtkPizza
 {
     GtkContainer container;
     GList *children;
 
 struct _GtkPizza
 {
     GtkContainer container;
     GList *children;

-    GtkMyShadowType shadow_type;
-
-    guint width;
-    guint height;
-
-    guint xoffset;
-    guint yoffset;

 
 

+    guint m_xoffset;
+    guint m_yoffset;
+    

     GdkWindow *bin_window;
     GdkWindow *bin_window;

-
-    GdkVisibilityState visibility;
-    gulong configure_serial;
-    gint scroll_x;
-    gint scroll_y;
-
-    gboolean clear_on_draw;
-    gboolean use_filter;
-    gboolean external_expose;
-};
-
-struct _GtkPizzaClass
-{
-  GtkContainerClass parent_class;
-
-  void  (*set_scroll_adjustments)   (GtkPizza     *pizza,
-                                     GtkAdjustment  *hadjustment,
-                                     GtkAdjustment  *vadjustment);

 };
 
 WXDLLIMPEXP_CORE
 };
 
 WXDLLIMPEXP_CORE


@@ -86,31 +40,27 @@ GtkType    gtk_pizza_get_type        (void);
 WXDLLIMPEXP_CORE
 GtkWidget* gtk_pizza_new             (void);
 
 WXDLLIMPEXP_CORE
 GtkWidget* gtk_pizza_new             (void);
 

-WXDLLIMPEXP_CORE
-void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
-                                      GtkMyShadowType    type);
+/* accessors */

 
 WXDLLIMPEXP_CORE
 
 WXDLLIMPEXP_CORE

-void       gtk_pizza_set_clear       (GtkPizza          *pizza,
-                                      gboolean           clear);
-
+gint       gtk_pizza_get_xoffset     (GtkPizza          *pizza); 

 WXDLLIMPEXP_CORE
 WXDLLIMPEXP_CORE

-void       gtk_pizza_set_filter      (GtkPizza          *pizza,
-                                      gboolean           use);
+gint       gtk_pizza_get_yoffset     (GtkPizza          *pizza); 
+WXDLLIMPEXP_CORE
+void       gtk_pizza_set_xoffset     (GtkPizza          *pizza, gint xoffset); 
+WXDLLIMPEXP_CORE
+void       gtk_pizza_set_yoffset     (GtkPizza          *pizza, gint yoffset); 
+

 
 WXDLLIMPEXP_CORE
 
 WXDLLIMPEXP_CORE

-void       gtk_pizza_set_external    (GtkPizza          *pizza,
-                                      gboolean           expose);
+gint       gtk_pizza_get_rtl_offset  (GtkPizza          *pizza); 
+

 
 WXDLLIMPEXP_CORE
 void       gtk_pizza_scroll          (GtkPizza          *pizza,
                                       gint               dx,
                                       gint               dy);
 
 
 WXDLLIMPEXP_CORE
 void       gtk_pizza_scroll          (GtkPizza          *pizza,
                                       gint               dx,
                                       gint               dy);
 

-WXDLLIMPEXP_CORE
-gint       gtk_pizza_child_resized   (GtkPizza          *pizza,
-                                      GtkWidget         *widget);
-

 WXDLLIMPEXP_CORE
 void       gtk_pizza_put             (GtkPizza          *pizza,
                                       GtkWidget         *widget,
 WXDLLIMPEXP_CORE
 void       gtk_pizza_put             (GtkPizza          *pizza,
                                       GtkWidget         *widget,


@@ -119,18 +69,6 @@ void       gtk_pizza_put             (GtkPizza          *pizza,
                                       gint               width,
                                       gint               height);
 
                                       gint               width,
                                       gint               height);
 

-WXDLLIMPEXP_CORE
-void       gtk_pizza_move            (GtkPizza          *pizza,
-                                      GtkWidget         *widget,
-                                      gint               x,
-                                      gint               y );
-
-WXDLLIMPEXP_CORE
-void       gtk_pizza_resize          (GtkPizza          *pizza,
-                                      GtkWidget         *widget,
-                                      gint               width,
-                                      gint               height );
-

 WXDLLIMPEXP_CORE
 void       gtk_pizza_set_size        (GtkPizza          *pizza,
                                       GtkWidget         *widget,
 WXDLLIMPEXP_CORE
 void       gtk_pizza_set_size        (GtkPizza          *pizza,
                                       GtkWidget         *widget,