// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "splitter.h"
-#endif
-
// 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"
#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)
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,
if ( !wxWindow::Create(parent, id, pos, size, style, name) )
return false;
+ if (size.x >= 0)
+ 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,
+ // 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;
}
void wxSplitterWindow::Init()
{
- m_container.SetContainerWindow(this);
+ WX_INIT_CONTROL_CONTAINER();
m_splitMode = wxSPLIT_VERTICAL;
m_permitUnsplitAlways = true;
m_firstY = 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;
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;
// 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())
{
m_windowOne = m_windowTwo;
m_windowTwo = (wxWindow *) 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() )
wxWindow *removedWindow = m_windowTwo;
m_windowTwo = (wxWindow *) 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
}
else
{
- SetSashPositionAndNotify(posSashNew);
+ DoSetSashPosition(posSashNew);
m_needUpdating = true;
}
}
int wxSplitterWindow::GetSashSize() const
{
- return wxRendererNative::Get().GetSplitterParams(this).widthSash;
+ return m_sashSize > -1 ? m_sashSize : wxRendererNative::Get().GetSplitterParams(this).widthSash;
}
int wxSplitterWindow::GetBorderSize() const
m_sashPosition,
m_splitMode == wxSPLIT_VERTICAL ? wxVERTICAL
: wxHORIZONTAL,
- m_isHot ? wxCONTROL_CURRENT : 0
+ m_isHot ? (int)wxCONTROL_CURRENT : 0
);
}
int wxSplitterWindow::AdjustSashPosition(int sashPos) const
{
- int window_size = GetWindowSize();
-
wxWindow *win;
win = GetWindow1();
if ( minSize == -1 || m_minimumPaneSize > minSize )
minSize = m_minimumPaneSize;
- int maxSize = window_size - minSize - GetBorderSize() - GetSashSize();
- if ( sashPos > maxSize )
+ int maxSize = GetWindowSize() - minSize - GetBorderSize() - GetSashSize();
+ if ( maxSize > 0 && sashPos > maxSize )
sashPos = maxSize;
}
// SetSashPosition():
m_requestedSashPosition = INT_MAX;
- if ( DoSetSashPosition(sashPos) )
- {
- wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, this);
- event.m_data.pos = m_sashPosition;
+ // note that we must send the event in any case, i.e. even if the sash
+ // position hasn't changed and DoSetSashPosition() returns false because we
+ // must generate a CHANGED event at the end of resizing
+ DoSetSashPosition(sashPos);
- (void)DoSendEvent(event);
- }
+ wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, this);
+ event.m_data.pos = m_sashPosition;
+
+ (void)DoSendEvent(event);
}
// Position and size subwindows.
{
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;
}
- GetWindow1()->SetSize(border, border, w1, h1);
GetWindow2()->SetSize(x2, y2, w2, h2);
+ GetWindow1()->SetSize(border, border, w1, h1);
}
wxClientDC dc(this);
// 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->IsShown())
+ if (window && !window->IsShown())
window->Show();
-
+
m_windowOne = window;
m_windowTwo = (wxWindow *) NULL;
DoSetSashPosition(0);
window1->Show();
if (! window2->IsShown())
window2->Show();
-
+
m_splitMode = mode;
m_windowOne = window1;
m_windowTwo = window2;
// get best sizes of subwindows
wxSize size1, size2;
if ( m_windowOne )
- size1 = m_windowOne->GetBestSize();
+ size1 = m_windowOne->GetEffectiveMinSize();
if ( m_windowTwo )
- size2 = m_windowTwo->GetBestSize();
+ size2 = m_windowTwo->GetEffectiveMinSize();
// sum them
//
projects / wxWidgets.git / blobdiff