invalidate m_selection in DoRemovePage(), not in DeletePage() (replaces patch 998984)

[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 1029d03f85318539652bcd5500866c4cc4fe492b..6440d8490a4c438bba8a32160a70d0a3ec1b5fc9 100644 (file)
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -1,6 +1,6 @@
 /* ///////////////////////////////////////////////////////////////////////////
 // Name:        win_gtk.h
 /* ///////////////////////////////////////////////////////////////////////////
 // Name:        win_gtk.h

-// Purpose:     wxWindows's GTK base widget = GtkPizza
+// 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


@@ -11,15 +11,17 @@
 #ifndef __GTK_PIZZA_H__
 #define __GTK_PIZZA_H__
 
 #ifndef __GTK_PIZZA_H__
 #define __GTK_PIZZA_H__
 

-#include <gdk/gdk.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkfeatures.h>
-

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

+#include <gdk/gdk.h>
+#include <gdk/gdkx.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_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;
+    GtkContainer container;
+    GList *children;
+    GtkMyShadowType shadow_type;

   
   

-  guint width;
-  guint height;
+    guint width;
+    guint height;

 
 

-  guint xoffset;
-  guint yoffset;
+    guint xoffset;
+    guint yoffset;

 
 

-  GdkWindow *bin_window;
+    GdkWindow *bin_window;

 
 

-  GdkVisibilityState visibility;
-  gulong configure_serial;
-  gint scroll_x;
-  gint scroll_y;
+    GdkVisibilityState visibility;
+    gulong configure_serial;
+    gint scroll_x;
+    gint scroll_y;

   
   

-  gboolean clear_on_draw;
+    gboolean clear_on_draw;
+    gboolean use_filter;
+    gboolean external_expose;

 };
 
 struct _GtkPizzaClass
 };
 
 struct _GtkPizzaClass


@@ -71,39 +85,48 @@ struct _GtkPizzaClass
 guint      gtk_pizza_get_type        (void);
 GtkWidget* gtk_pizza_new             (void);
 
 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_shadow_type (GtkPizza          *pizza,
+                                                     GtkMyShadowType    type);

                                        
                                        

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

                                        
                                        

-void       gtk_pizza_scroll            (GtkPizza     *pizza,   
-                                         gint         dx,
-                                         gint         dy);
+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_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_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);
+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 */