adjust so that mono bitmaps don't get an alpha channel

[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..0340f05dfd4335b0366ddd7a4b06c23a91d86ff5 100644 (file)
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -15,15 +15,11 @@
 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 ())
 
 /* Shadow types */
 #define GTK_IS_PIZZA(obj)       GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())
 
 /* Shadow types */


@@ -54,22 +50,12 @@ struct _GtkPizza
     GList *children;
     GtkMyShadowType shadow_type;
 
     GList *children;
     GtkMyShadowType shadow_type;
 

-    guint width;
-    guint height;
-
-    guint xoffset;
-    guint yoffset;
+    guint m_xoffset;
+    guint m_yoffset;
+    
+    gint  m_width;

 
     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
 };
 
 struct _GtkPizzaClass


@@ -86,31 +72,30 @@ 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
+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_filter      (GtkPizza          *pizza,
-                                      gboolean           use);
+gint       gtk_pizza_get_rtl_offset  (GtkPizza          *pizza); 

 
 WXDLLIMPEXP_CORE
 
 WXDLLIMPEXP_CORE

-void       gtk_pizza_set_external    (GtkPizza          *pizza,
-                                      gboolean           expose);
+void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
+                                      GtkMyShadowType    type);

 
 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 +104,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,