Applied [ 799292 ] wxWizard and Validator Bug and Fix

[wxWidgets.git] / include / wx / window.h

diff --git a/include/wx/window.h b/include/wx/window.h
index f91e96671af7bd064224a6f83246fdddfdbd0f13..fae09c7ec06746a4b84543ea60d1e347f8e42fdc 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -102,8 +102,9 @@ public:
     // creating the window
     // -------------------
 
     // creating the window
     // -------------------
 

-        // default ctor
-    wxWindowBase() { InitBase(); }
+        // default ctor, initializes everything which can be initialized before
+        // Create()
+    wxWindowBase();

 
         // pseudo ctor (can't be virtual, called from ctor)
     bool CreateBase(wxWindowBase *parent,
 
         // pseudo ctor (can't be virtual, called from ctor)
     bool CreateBase(wxWindowBase *parent,


@@ -1026,10 +1027,6 @@ protected:
     int                   m_maxVirtualWidth;
     int                   m_maxVirtualHeight;
 
     int                   m_maxVirtualWidth;
     int                   m_maxVirtualHeight;
 

-    // common part of all ctors: it is not virtual because it is called from
-    // ctor
-    void InitBase();
-

     // override this to change the default (i.e. used when no style is
     // specified) border for the window class
     virtual wxBorder GetDefaultBorder() const;
     // override this to change the default (i.e. used when no style is
     // specified) border for the window class
     virtual wxBorder GetDefaultBorder() const;


@@ -1120,9 +1117,11 @@ protected:
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) = 0;
 #endif // wxUSE_MENUS
 
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) = 0;
 #endif // wxUSE_MENUS
 

-    // Makes an adjustment to the window position (for example, a frame that has
-    // a toolbar that it manages itself).
-    virtual void AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) const;
+    // Makes an adjustment to the window position to make it relative to the
+    // parents client area, e.g. if the parent is a frame with a toolbar, its
+    // (0, 0) is just below the toolbar
+    virtual void AdjustForParentClientOrigin(int& x, int& y,
+                                             int sizeFlags = 0) const;

 
 
 private:
 
 
 private:


@@ -1148,10 +1147,6 @@ private:
         #define wxWindowNative wxWindowMSW
     #else // !wxUniv
         #define wxWindowMSW wxWindow
         #define wxWindowNative wxWindowMSW
     #else // !wxUniv
         #define wxWindowMSW wxWindow

-        #define sm_classwxWindowMSW sm_classwxWindow
-        #define sm_constructorPropertiesCountwxWindowMSW sm_constructorPropertiesCountwxWindow
-        #define sm_constructorPropertieswxWindowMSW sm_constructorPropertieswxWindow
-        #define sm_constructorwxWindowMSW sm_constructorwxWindow

     #endif // wxUniv/!wxUniv
     #include "wx/msw/window.h"
 #elif defined(__WXMOTIF__)
     #endif // wxUniv/!wxUniv
     #include "wx/msw/window.h"
 #elif defined(__WXMOTIF__)


@@ -1161,7 +1156,6 @@ private:
         #define wxWindowNative wxWindowGTK
     #else // !wxUniv
         #define wxWindowGTK wxWindow
         #define wxWindowNative wxWindowGTK
     #else // !wxUniv
         #define wxWindowGTK wxWindow

-        #define sm_classwxWindowGTK sm_classwxWindow

     #endif // wxUniv
     #include "wx/gtk/window.h"
 #elif defined(__WXX11__)
     #endif // wxUniv
     #include "wx/gtk/window.h"
 #elif defined(__WXX11__)


@@ -1169,7 +1163,6 @@ private:
         #define wxWindowNative wxWindowX11
     #else // !wxUniv
         #define wxWindowX11 wxWindow
         #define wxWindowNative wxWindowX11
     #else // !wxUniv
         #define wxWindowX11 wxWindow

-        #define sm_classwxWindowX11 sm_classwxWindow

     #endif // wxUniv
     #include "wx/x11/window.h"
 #elif defined(__WXMGL__)
     #endif // wxUniv
     #include "wx/x11/window.h"
 #elif defined(__WXMGL__)


@@ -1177,7 +1170,6 @@ private:
         #define wxWindowNative wxWindowMGL
     #else // !wxUniv
         #define wxWindowMGL wxWindow
         #define wxWindowNative wxWindowMGL
     #else // !wxUniv
         #define wxWindowMGL wxWindow

-        #define sm_classwxWindowMGL sm_classwxWindow

     #endif // wxUniv
     #include "wx/mgl/window.h"
 #elif defined(__WXMAC__)
     #endif // wxUniv
     #include "wx/mgl/window.h"
 #elif defined(__WXMAC__)


@@ -1185,7 +1177,6 @@ private:
         #define wxWindowNative wxWindowMac
     #else // !wxUniv
         #define wxWindowMac wxWindow
         #define wxWindowNative wxWindowMac
     #else // !wxUniv
         #define wxWindowMac wxWindow

-        #define sm_classwxWindowMac sm_classwxWindow

     #endif // wxUniv
     #include "wx/mac/window.h"
 #elif defined(__WXCOCOA__)
     #endif // wxUniv
     #include "wx/mac/window.h"
 #elif defined(__WXCOCOA__)


@@ -1193,7 +1184,6 @@ private:
         #define wxWindowNative wxWindowCocoa
     #else // !wxUniv
         #define wxWindowCocoa wxWindow
         #define wxWindowNative wxWindowCocoa
     #else // !wxUniv
         #define wxWindowCocoa wxWindow

-        #define sm_classwxWindowCocoa sm_classwxWindow

     #endif // wxUniv
     #include "wx/cocoa/window.h"
 #elif defined(__WXPM__)
     #endif // wxUniv
     #include "wx/cocoa/window.h"
 #elif defined(__WXPM__)


@@ -1201,7 +1191,6 @@ private:
         #define wxWindowNative wxWindowOS2
     #else // !wxUniv
         #define wxWindowOS2 wxWindow
         #define wxWindowNative wxWindowOS2
     #else // !wxUniv
         #define wxWindowOS2 wxWindow

-        #define sm_classwxWindowOS2 sm_classwxWindow

     #endif // wxUniv/!wxUniv
     #include "wx/os2/window.h"
 #endif
     #endif // wxUniv/!wxUniv
     #include "wx/os2/window.h"
 #endif