move wxWindowGTK::DoPopupMenu back to window.cpp

[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 1029d03f85318539652bcd5500866c4cc4fe492b..78cbe0b531ae327c91656096207425be697c8b76 100644 (file)
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -1,25 +1,27 @@
 /* ///////////////////////////////////////////////////////////////////////////
 /* ///////////////////////////////////////////////////////////////////////////

-// Name:        win_gtk.h
-// Purpose:     wxWindows's GTK base widget = GtkPizza
+// Name:        wx/gtk1/win_gtk.h
+// Purpose:     wxWidgets's GTK base widget = GtkPizza

 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////// */
 
 
 #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/gtkfeatures.h>
 
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkadjustment.h>
 #include <gtk/gtkfeatures.h>
 

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


@@ -28,35 +30,47 @@ extern "C" {
 /* Shadow types */
 typedef enum
 {
 /* Shadow types */
 typedef enum
 {

-  GTK_MYSHADOW_NONE,
-  GTK_MYSHADOW_THIN,
-  GTK_MYSHADOW_IN,
-  GTK_MYSHADOW_OUT
+    GTK_MYSHADOW_NONE,
+    GTK_MYSHADOW_THIN,
+    GTK_MYSHADOW_IN,
+    GTK_MYSHADOW_OUT

 } GtkMyShadowType;
 
 } 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
 {
 struct _GtkPizza
 {

-  GtkContainer container;
-  GList *children;
-  GtkMyShadowType shadow_type;
-  
-  guint width;
-  guint height;
-
-  guint xoffset;
-  guint yoffset;
-
-  GdkWindow *bin_window;
-
-  GdkVisibilityState visibility;
-  gulong configure_serial;
-  gint scroll_x;
-  gint scroll_y;
-  
-  gboolean clear_on_draw;
+    GtkContainer container;
+    GList *children;
+    GtkMyShadowType shadow_type;
+
+    guint width;
+    guint height;
+
+    guint xoffset;
+    guint yoffset;
+
+    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


@@ -64,46 +78,67 @@ struct _GtkPizzaClass
   GtkContainerClass parent_class;
 
   void  (*set_scroll_adjustments)   (GtkPizza     *pizza,
   GtkContainerClass parent_class;
 
   void  (*set_scroll_adjustments)   (GtkPizza     *pizza,

-                                    GtkAdjustment  *hadjustment,
-                                    GtkAdjustment  *vadjustment);
+                                     GtkAdjustment  *hadjustment,
+                                     GtkAdjustment  *vadjustment);

 };
 
 };
 

-guint      gtk_pizza_get_type        (void);
+WXDLLIMPEXP_CORE
+GtkType    gtk_pizza_get_type        (void);
+WXDLLIMPEXP_CORE

 GtkWidget* gtk_pizza_new             (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_scroll            (GtkPizza     *pizza,   
-                                         gint         dx,
-                                         gint         dy);
-                                       
-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);
+WXDLLIMPEXP_CORE
+void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
+                                      GtkMyShadowType    type);
+
+WXDLLIMPEXP_CORE
+void       gtk_pizza_set_clear       (GtkPizza          *pizza,
+                                      gboolean           clear);
+
+WXDLLIMPEXP_CORE
+void       gtk_pizza_set_filter      (GtkPizza          *pizza,
+                                      gboolean           use);
+
+WXDLLIMPEXP_CORE
+void       gtk_pizza_set_external    (GtkPizza          *pizza,
+                                      gboolean           expose);
+
+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,
+                                      gint               x,
+                                      gint               y,
+                                      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,
+                                      gint               x,
+                                      gint               y,
+                                      gint               width,
+                                      gint               height);

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