X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/693460233749fec3bf79720268d3cd8dfc55c78d..c9c023ddeb1ba8d5c50b8a2d7718b1dd18665b2b:/src/generic/splitter.cpp?ds=sidebyside

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 6e084f1696..444304ae32 100644
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -107,7 +107,7 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
 
 void wxSplitterWindow::Init()
 {
-    m_container.SetContainerWindow(this);
+    WX_INIT_CONTROL_CONTAINER();
 
     m_splitMode = wxSPLIT_VERTICAL;
     m_permitUnsplitAlways = true;
@@ -126,7 +126,7 @@ void wxSplitterWindow::Init()
     m_minimumPaneSize = 0;
     m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
     m_sashCursorNS = wxCursor(wxCURSOR_SIZENS);
-    m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxSOLID);
+    m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxPENSTYLE_SOLID);
 
     m_needUpdating = false;
     m_isHot = false;
@@ -213,8 +213,10 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     // following the mouse movement while it drags the sash, without it we only
     // draw the sash at the new position but only resize the windows when the
     // dragging is finished
-#if defined( __WXMAC__ ) && defined(TARGET_API_MAC_OSX) && TARGET_API_MAC_OSX == 1
-    bool isLive = true ; // FIXME: why?
+#if defined( __WXMAC__ ) 
+    // FIXME : this should be usable also with no live update, but then this
+    // currently is not visible
+    bool isLive = true;
 #else
     bool isLive = HasFlag(wxSP_LIVE_UPDATE);
 #endif
@@ -717,7 +719,7 @@ void wxSplitterWindow::SizeWindows()
 // Set pane for unsplit window
 void wxSplitterWindow::Initialize(wxWindow *window)
 {
-    wxASSERT_MSG( (!window || (window && window->GetParent() == this)),
+    wxASSERT_MSG( (!window || window->GetParent() == this),
                   _T("windows in the splitter should have it as parent!") );
 
     if (window && !window->IsShown())
@@ -884,9 +886,9 @@ wxSize wxSplitterWindow::DoGetBestSize() const
     // get best sizes of subwindows
     wxSize size1, size2;
     if ( m_windowOne )
-        size1 = m_windowOne->GetAdjustedBestSize();
+        size1 = m_windowOne->GetEffectiveMinSize();
     if ( m_windowTwo )
-        size2 = m_windowTwo->GetAdjustedBestSize();
+        size2 = m_windowTwo->GetEffectiveMinSize();
 
     // sum them
     //