Ensure that the progress dialog parent is activated at the end under MSW.

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

diff --git a/include/wx/gtk/private/win_gtk.h b/include/wx/gtk/private/win_gtk.h
index c1f55a85becfbedc72565a80da7b40745f0576ba..010afa0aa500927862484463570b2c645090a200 100644 (file)
--- a/include/wx/gtk/private/win_gtk.h
+++ b/include/wx/gtk/private/win_gtk.h
@@ -1,5 +1,5 @@
 /* ///////////////////////////////////////////////////////////////////////////
 /* ///////////////////////////////////////////////////////////////////////////

-// Name:        win_gtk.h
+// Name:        wx/gtk/private/win_gtk.h

 // Purpose:     native GTK+ widget for wxWindow
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     native GTK+ widget for wxWindow
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,7 +10,7 @@
 #ifndef _WX_GTK_PIZZA_H_
 #define _WX_GTK_PIZZA_H_
 
 #ifndef _WX_GTK_PIZZA_H_
 #define _WX_GTK_PIZZA_H_
 

-#include <gtk/gtkfixed.h>
+#include <gtk/gtk.h>

 
 #define WX_PIZZA(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, wxPizza::type(), wxPizza)
 #define WX_IS_PIZZA(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, wxPizza::type())
 
 #define WX_PIZZA(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, wxPizza::type(), wxPizza)
 #define WX_IS_PIZZA(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, wxPizza::type())


@@ -21,19 +21,18 @@ struct WXDLLIMPEXP_CORE wxPizza
     enum { BORDER_STYLES =
         wxBORDER_SIMPLE | wxBORDER_RAISED | wxBORDER_SUNKEN | wxBORDER_THEME };
 
     enum { BORDER_STYLES =
         wxBORDER_SIMPLE | wxBORDER_RAISED | wxBORDER_SUNKEN | wxBORDER_THEME };
 

-    static GtkWidget* New(long windowStyle, void *owner);
+    static GtkWidget* New(long windowStyle = 0);

     static GType type();
     void move(GtkWidget* widget, int x, int y);
     static GType type();
     void move(GtkWidget* widget, int x, int y);

+    void put(GtkWidget* widget, int x, int y);

     void scroll(int dx, int dy);
     void get_border_widths(int& x, int& y);
 
     GtkFixed m_fixed;
     void scroll(int dx, int dy);
     void get_border_widths(int& x, int& y);
 
     GtkFixed m_fixed;

-    GdkWindow* m_backing_window;

     int m_scroll_x;
     int m_scroll_y;
     int m_border_style;
     bool m_is_scrollable;
     int m_scroll_x;
     int m_scroll_y;
     int m_border_style;
     bool m_is_scrollable;

-    void *m_owner;

 };
 
 #endif // _WX_GTK_PIZZA_H_
 };
 
 #endif // _WX_GTK_PIZZA_H_