guard against errors like in wxStringBase::AllocBeforeWrite code (1123226)

[wxWidgets.git] / src / generic / splitter.cpp

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 54e664c2adc5ebffc7f9ae12910e0fbee7d774f2..e2a2a3ca99ab66eb9cd79a537f54eae0546e0b12 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -96,9 +96,13 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
 
     m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0;
 
+    // FIXME: with this line the background is not erased at all under GTK1,
+    //        so temporary avoid it there
+#if !defined(__WXGTK__) || defined(__WXGTK20__)
     // don't erase the splitter background, it's pointless as we overwrite it
     // anyhow
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
+#endif
 
     return true;
 }
@@ -118,7 +122,7 @@ void wxSplitterWindow::Init()
     m_firstY = 0;
     m_sashPosition = m_requestedSashPosition = 0;
     m_sashGravity = 0.0;
-    m_lastSize = wxSize(0,0);
+    m_lastSize = wxSize();
     m_checkRequestedSashPosition = false;
     m_minimumPaneSize = 0;
     m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
@@ -410,7 +414,7 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
 
     if ( iconized )
     {
-        m_lastSize = wxSize(0,0);
+        m_lastSize = wxSize();
 
         event.Skip();
 
@@ -502,7 +506,7 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
                                 m_sashPosition,
                                 m_splitMode == wxSPLIT_VERTICAL ? wxVERTICAL
                                                                 : wxHORIZONTAL,
-                                m_isHot ? wxCONTROL_CURRENT : 0
+                                m_isHot ? (int)wxCONTROL_CURRENT : 0
                             );
 }
 
@@ -711,7 +715,7 @@ void wxSplitterWindow::Initialize(wxWindow *window)
 
     if (! window->IsShown())
         window->Show();
-    
+
     m_windowOne = window;
     m_windowTwo = (wxWindow *) NULL;
     DoSetSashPosition(0);
@@ -737,7 +741,7 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode,
         window1->Show();
     if (! window2->IsShown())
         window2->Show();
-    
+
     m_splitMode = mode;
     m_windowOne = window1;
     m_windowTwo = window2;