use the native wxImageList under Win32 as otherwise xUniv doesn't link currently

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

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index ff65670f54c3922b866707d2bfa059e8e915f2be..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;
 
@@ -69,19 +70,19 @@ public:
     wxSplitterWindow(wxWindow *parent, wxWindowID id = -1,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
-                     long style = wxSP_3D|wxCLIP_CHILDREN,
+                     long style = wxSP_3D,
                      const wxString& name = "splitter")
     {
         Init();
         Create(parent, id, pos, size, style, name);
     }
 
-    ~wxSplitterWindow();
+    virtual ~wxSplitterWindow();
 
     bool Create(wxWindow *parent, wxWindowID id = -1,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
-                     long style = wxSP_3D|wxCLIP_CHILDREN,
+                     long style = wxSP_3D,
                      const wxString& name = "splitter");
 
     // Gets the only or left/top pane
@@ -209,8 +210,11 @@ protected:
     void SendUnsplitEvent(wxWindow *winRemoved);
 
 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;
@@ -237,6 +241,8 @@ protected:
     wxPen*      m_facePen;
 
 private:
+    WX_DECLARE_CONTROL_CONTAINER();
+
     DECLARE_DYNAMIC_CLASS(wxSplitterWindow)
     DECLARE_EVENT_TABLE()
 };