move m_sizeSet out of wxWindow

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index 18b7a743ccc09e135d28410ed94fd2c27249ce24..e150b2d3e79d3f3d03b0c4856d17e890935b4392 100644 (file)
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/popupwin.h
@@ -46,6 +46,8 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
 private:
+    bool m_sizeSet;
+
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 };

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index 7c0998c7df2145f810c304436f7126cc8a805325..bd0792f340e8c7f7f5651b9869e74a3bf0532231 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -103,6 +103,8 @@ public:
     long          m_gdkFunc,
                   m_gdkDecor;
 
+    bool m_sizeSet;
+
     // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
     // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
     int m_urgency_hint;
@@ -116,6 +118,8 @@ public:
     // return the full size of the window without WM decorations
     void GTKDoGetSize(int *width, int *height) const;
 
+    void GtkUpdateSize() { m_sizeSet = false; }
+
 protected:
     // common part of all ctors
     void Init();

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 5bcfb26b5cfcfaac20c2f9e4d0d75a9ad63b5da6..60ee66ab09d06a01e7392845e3e7d1e6cd68d159 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -220,12 +220,6 @@ public:
     virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
 
-    // Called from GTK signal handlers. it indicates that
-    // the layouting functions have to be called later on
-    // (i.e. in idle time, implemented in OnInternalIdle() ).
-    void GtkUpdateSize() { m_sizeSet = false; }
-
-
     // Called when a window should delay showing itself
     // until idle time. This partly mimmicks defered
     // sizing under MSW.
@@ -304,7 +298,6 @@ public:
     bool                 m_nativeSizeEvent:1;   // wxGLCanvas sends wxSizeEvent upon "alloc_size"
     bool                 m_hasScrolling:1;
     bool                 m_hasVMT:1;
-    bool                 m_sizeSet:1;
     bool                 m_resizing:1;
     bool                 m_hasFocus:1;          // true if == FindFocus()
     bool                 m_isScrolling:1;       // dragging scrollbar thumb?

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 51027b628d81651dd13e737f865ea77892172982..3525a297db6ae651490cad071345c06817c6e93a 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -424,7 +424,7 @@ void wxMDIChildFrame::SetTitle( const wxString &title )
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
+static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxMDIChildFrame *win )
 {
     if ((win->m_x == alloc->x) &&
         (win->m_y == alloc->y) &&

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 0b1aff6fa8b1d61bbdcb963365475c73e6da6ee3..2389e69cd634aecb3a4ed0e8c9e3d736ca984e53 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2246,7 +2246,6 @@ void wxWindowGTK::Init()
     m_width = 0;
     m_height = 0;
 
-    m_sizeSet = false;
     m_hasVMT = false;
     m_isBeingDeleted = false;