wxRESIZE_BOX -> wxRESIZE_BORDER (bug 515364)

[wxWidgets.git] / include / wx / generic / splitter.h

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index 853e75e5a1a499abc08fc853866275c483cda8ec..4b0d641a56e4c66119d35e689cf3129e4b22732a 100644 (file)
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/window.h"                      // base class declaration
+#include "wx/containr.h"                    // wxControlContainer
 
 class WXDLLEXPORT wxSplitterEvent;
 
@@ -37,8 +38,6 @@ enum
     wxSPLIT_DRAG_LEFT_DOWN
 };
 
-class WXDLLEXPORT wxControlContainer;
-
 // ---------------------------------------------------------------------------
 // wxSplitterWindow maintains one or two panes, with
 // an optional vertical or horizontal split which
@@ -62,7 +61,7 @@ public:
 // Public API
 
     // Default constructor
-    wxSplitterWindow() : m_container(this)
+    wxSplitterWindow()
     {
         Init();
     }
@@ -73,7 +72,6 @@ public:
                      const wxSize& size = wxDefaultSize,
                      long style = wxSP_3D,
                      const wxString& name = "splitter")
-        : m_container(this)
     {
         Init();
         Create(parent, id, pos, size, style, name);
@@ -214,6 +212,9 @@ protected:
 protected:
     // common part of all ctors
     void Init();
+    
+    // adjusts sash position with respect to min. pane and window sizes
+    void AdjustSashPosition(int &sashPos);
 
     int         m_splitMode;
     bool        m_permitUnsplitAlways;