use #if WXWIN_COMPAT and not #ifdef (patch 826160)

[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 b4bd331726536463cf773a4604ba21e2bbebaf8d..6bd073219b9e4ddab27118131436187ab0f6fc24 100644 (file)
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -11,14 +11,17 @@
 #ifndef __GTK_PIZZA_H__
 #define __GTK_PIZZA_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/gtkadjustment.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkadjustment.h>

+#ifndef __WXGTK20__

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

-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#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_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)


@@ -33,9 +36,19 @@ typedef enum
     GTK_MYSHADOW_OUT
 } GtkMyShadowType;
 
     GTK_MYSHADOW_OUT
 } GtkMyShadowType;
 

+typedef struct _GtkPizzaChild    GtkPizzaChild;

 typedef struct _GtkPizza        GtkPizza;
 typedef struct _GtkPizzaClass   GtkPizzaClass;
 
 typedef struct _GtkPizza        GtkPizza;
 typedef struct _GtkPizzaClass   GtkPizzaClass;
 

+struct _GtkPizzaChild
+{
+    GtkWidget *widget;
+    gint x;
+    gint y;
+    gint width;
+    gint height;
+};
+

 struct _GtkPizza
 {
     GtkContainer container;
 struct _GtkPizza
 {
     GtkContainer container;


@@ -57,6 +70,7 @@ struct _GtkPizza
   
     gboolean clear_on_draw;
     gboolean use_filter;
   
     gboolean clear_on_draw;
     gboolean use_filter;

+    gboolean external_expose;

 };
 
 struct _GtkPizzaClass
 };
 
 struct _GtkPizzaClass


@@ -80,9 +94,15 @@ void       gtk_pizza_set_clear       (GtkPizza          *pizza,
 void       gtk_pizza_set_filter      (GtkPizza          *pizza,
                                       gboolean           use);         
                                        
 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);
 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,
                                        
 void       gtk_pizza_put             (GtkPizza          *pizza,
                                       GtkWidget         *widget,