X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..4c509aecb650100d0bca898ec05801a0fbcae1f4:/src/generic/splitter.cpp?ds=sidebyside diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index 2cf222b90e..257939be07 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -12,17 +12,20 @@ // 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" #include "wx/log.h" + #include "wx/dcclient.h" #include "wx/dcscreen.h" #include "wx/window.h" @@ -32,20 +35,14 @@ #include "wx/settings.h" #endif -#ifdef __WXMAC__ - #include "wx/mac/private.h" -#endif - #include "wx/renderer.h" -#include "wx/splitter.h" - #include -DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_UNSPLIT) +wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, wxSplitterEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, wxSplitterEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, wxSplitterEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_UNSPLIT, wxSplitterEvent ) IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow) @@ -72,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, @@ -87,6 +84,11 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, style &= ~wxBORDER_MASK; style |= wxBORDER_NONE; +#ifdef __WXMAC__ + // CoreGraphics can't paint sash feedback + style |= wxSP_LIVE_UPDATE; +#endif + if ( !wxWindow::Create(parent, id, pos, size, style, name) ) return false; @@ -94,7 +96,7 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, m_lastSize.x = size.x; if (size.y >= 0) m_lastSize.y = size.y; - + m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0; // FIXME: with this line the background is not erased at all under GTK1, @@ -110,12 +112,12 @@ 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; - m_windowOne = (wxWindow *) NULL; - m_windowTwo = (wxWindow *) NULL; + m_windowOne = NULL; + m_windowTwo = NULL; m_dragMode = wxSPLIT_DRAG_NONE; m_oldX = 0; m_oldY = 0; @@ -129,7 +131,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; @@ -209,17 +211,22 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) int x = (int)event.GetX(), y = (int)event.GetY(); - if (GetWindowStyle() & wxSP_NOSASH) + if ( GetWindowStyle() & wxSP_NOSASH ) + { + event.Skip(); return; + } // with wxSP_LIVE_UPDATE style the splitter windows are always resized // 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__ ) + // FIXME : this should be usable also with no live update, but then this + // currently is not visible + bool isLive = true; #else - bool isLive = (GetWindowStyleFlag() & wxSP_LIVE_UPDATE) != 0; + bool isLive = HasFlag(wxSP_LIVE_UPDATE); #endif if (event.LeftDown()) { @@ -290,22 +297,22 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) // We remove the first window from the view wxWindow *removedWindow = m_windowOne; m_windowOne = m_windowTwo; - m_windowTwo = (wxWindow *) NULL; + m_windowTwo = NULL; OnUnsplit(removedWindow); - wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this); - event.m_data.win = removedWindow; - (void)DoSendEvent(event); + wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this); + eventUnsplit.m_data.win = removedWindow; + (void)DoSendEvent(eventUnsplit); SetSashPositionAndNotify(0); } else if ( posSashNew == GetWindowSize() ) { // We remove the second window from the view wxWindow *removedWindow = m_windowTwo; - m_windowTwo = (wxWindow *) NULL; + m_windowTwo = NULL; OnUnsplit(removedWindow); - wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this); - event.m_data.win = removedWindow; - (void)DoSendEvent(event); + wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this); + eventUnsplit.m_data.win = removedWindow; + (void)DoSendEvent(eventUnsplit); SetSashPositionAndNotify(0); } else @@ -392,6 +399,10 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) { OnDoubleClickSash(x, y); } + else + { + event.Skip(); + } } void wxSplitterWindow::OnSize(wxSizeEvent& event) @@ -684,17 +695,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; } @@ -712,14 +731,14 @@ 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()) window->Show(); m_windowOne = window; - m_windowTwo = (wxWindow *) NULL; + m_windowTwo = NULL; DoSetSashPosition(0); } @@ -789,13 +808,13 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove) if ( toRemove == NULL || toRemove == m_windowTwo) { win = m_windowTwo ; - m_windowTwo = (wxWindow *) NULL; + m_windowTwo = NULL; } else if ( toRemove == m_windowOne ) { win = m_windowOne ; m_windowOne = m_windowTwo; - m_windowTwo = (wxWindow *) NULL; + m_windowTwo = NULL; } else { @@ -879,9 +898,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 //