X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4766d85b113811f4d5534aceb5ba87478e981e04..5eed855656b3996f4c0aa0a585a4820a2af6d628:/src/generic/splitter.cpp diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index f1ba90db39..3cffee36f0 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -94,11 +94,6 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, // allow TABbing from one window to the other style |= wxTAB_TRAVERSAL; - // we draw our border ourselves to blend the sash with it - style &= ~wxBORDER_MASK; - style |= wxBORDER_NONE; - - if ( !wxWindow::Create(parent, id, pos, size, style, name) ) return false; @@ -134,7 +129,6 @@ void wxSplitterWindow::Init() m_sashStart = 0; m_sashPosition = m_requestedSashPosition = 0; m_sashGravity = 0.0; - m_sashSize = -1; // -1 means use the native sash size m_lastSize = wxSize(0,0); m_checkRequestedSashPosition = false; m_minimumPaneSize = 0; @@ -196,7 +190,7 @@ void wxSplitterWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) wxPaintDC dc(this); #ifdef __WXOSX__ // as subpanels might have a transparent background we must erase the background - // at least on OSX, otherwise traces of the sash will remain + // at least on OSX, otherwise traces of the sash will remain // test with: splitter sample->replace right window dc.Clear(); #endif @@ -496,7 +490,7 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance) int wxSplitterWindow::GetSashSize() const { - return m_sashSize > -1 ? m_sashSize : wxRendererNative::Get().GetSplitterParams(this).widthSash; + return wxRendererNative::Get().GetSplitterParams(this).widthSash; } int wxSplitterWindow::GetBorderSize() const