Applied patch [ 810585 ] wxTextCtrl::GetTextLine returns empty String

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

diff --git a/include/wx/window.h b/include/wx/window.h
index b17fcf0e7f8cde44096776c7fa86d4923fe94785..fae09c7ec06746a4b84543ea60d1e347f8e42fdc 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -102,8 +102,9 @@ public:
     // 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,
@@ -1026,10 +1027,6 @@ protected:
     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;
@@ -1120,9 +1117,11 @@ protected:
     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: