X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da6205f7fb49b9a806b9e8f75f8e05af4dee61f2..3ecb8a536541106a92bed839af905c77495ddbed:/src/generic/splitter.cpp

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 1dba3581bf..958de8cc0b 100644
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -12,12 +12,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#if wxUSE_SPLITTER
-
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
+#if wxUSE_SPLITTER
+
+#include "wx/splitter.h"
+
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/utils.h"
@@ -33,14 +35,8 @@
     #include "wx/settings.h"
 #endif
 
-#ifdef __WXMAC__
-    #include "wx/mac/private.h"
-#endif
-
 #include "wx/renderer.h"
 
-#include "wx/splitter.h"
-
 #include <stdlib.h>
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)
@@ -73,7 +69,7 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxSplitterWindow)
 END_EVENT_TABLE()
 
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow)
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow, wxWindow)
 
 bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
                                    const wxPoint& pos,
@@ -111,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;
@@ -217,10 +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__ ) && TARGET_API_MAC_OSX == 1
-    bool isLive = true ;
+#if defined( __WXMAC__ ) && defined(TARGET_API_MAC_OSX) && TARGET_API_MAC_OSX == 1
+    bool isLive = true ; // FIXME: why?
 #else
-    bool isLive = (GetWindowStyleFlag() & wxSP_LIVE_UPDATE) != 0;
+    bool isLive = HasFlag(wxSP_LIVE_UPDATE);
 #endif
     if (event.LeftDown())
     {
@@ -685,17 +681,25 @@ void wxSplitterWindow::SizeWindows()
         {
             w1 = size1;
             w2 = w - 2*border - sash - w1;
-            h1 =
+            if (w2 < 0)
+                w2 = 0;
             h2 = h - 2*border;
+            if (h2 < 0)
+                h2 = 0;
+            h1 = h2;
             x2 = size2;
             y2 = border;
         }
         else // horz splitter
         {
-            w1 =
             w2 = w - 2*border;
+            if (w2 < 0)
+                w2 = 0;
+            w1 = w2;
             h1 = size1;
             h2 = h - 2*border - sash - h1;
+            if (h2 < 0)
+                h2 = 0;
             x2 = border;
             y2 = size2;
         }
@@ -880,9 +884,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
     //