wxUSE_TOOLTIPS and wxUSE_IMAGE furthur fixes

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 51d715bdb91d27e920e5c99719ee2506bf480631..7c5d2354bdf3a0647d8976e7411a04b43e3117b6 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;
 }
@@ -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
                             );
 }
 
@@ -709,6 +713,9 @@ void wxSplitterWindow::Initialize(wxWindow *window)
     wxASSERT_MSG( (!window || (window && window->GetParent() == this)),
                   _T("windows in the splitter should have it as parent!") );
 
+    if (! window->IsShown())
+        window->Show();
+
     m_windowOne = window;
     m_windowTwo = (wxWindow *) NULL;
     DoSetSashPosition(0);
@@ -734,7 +741,7 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode,
         window1->Show();
     if (! window2->IsShown())
         window2->Show();
-    
+
     m_splitMode = mode;
     m_windowOne = window1;
     m_windowTwo = window2;