/////////////////////////////////////////////////////////////////////////////
-// Name: src/common/window.cpp
+// Name: src/common/wincmn.cpp
// Purpose: common (to all ports) wxWindow functions
// Author: Julian Smart, Vadim Zeitlin
// Modified by:
// Created: 13/07/98
-// RCS-ID: $Id$
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#endif
#include "wx/platinfo.h"
+#include "wx/recguard.h"
#include "wx/private/window.h"
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
#include "wx/msw/wrapwin.h"
#endif
wxMenu *wxCurrentPopupMenu = NULL;
#endif // wxUSE_MENUS
+extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[] = "panel";
+
+namespace wxMouseCapture
+{
+
+// Check if the given window is in the capture stack.
+bool IsInCaptureStack(wxWindowBase* win);
+
+} // wxMouseCapture
+
// ----------------------------------------------------------------------------
// static data
// ----------------------------------------------------------------------------
// separately otherwise chaos occurs. Right now easiest is to test for negative ids,
// as windows with negative ids never can be recreated anyway
+
bool wxWindowStreamingCallback( const wxObject *object, wxObjectWriter *,
- wxObjectReaderCallback *, wxVariantBaseArray & )
+ wxObjectWriterCallback *, const wxStringToAnyHashMap & )
{
const wxWindow * win = wx_dynamic_cast(const wxWindow*, object);
if ( win && win->GetId() < 0 )
wxCOLLECTION_TYPE_INFO( wxWindow*, wxWindowList );
template<> void wxCollectionToVariantArray( wxWindowList const &theList,
- wxVariantBaseArray &value)
+ wxAnyList &value)
{
- wxListCollectionToVariantArray<wxWindowList::compatibility_iterator>( theList, value );
+ wxListCollectionToAnyList<wxWindowList::compatibility_iterator>( theList, value );
}
wxDEFINE_FLAGS( wxWindowStyle )
wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) // bg
wxPROPERTY( ForegroundColour, wxColour, SetForegroundColour, GetForegroundColour, \
wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) // fg
-wxPROPERTY( Enabled, bool, Enable, IsEnabled, wxVariantBase((bool)true), 0 /*flags*/, \
+wxPROPERTY( Enabled, bool, Enable, IsEnabled, wxAny((bool)true), 0 /*flags*/, \
wxT("Helpstring"), wxT("group"))
-wxPROPERTY( Shown, bool, Show, IsShown, wxVariantBase((bool)true), 0 /*flags*/, \
+wxPROPERTY( Shown, bool, Show, IsShown, wxAny((bool)true), 0 /*flags*/, \
wxT("Helpstring"), wxT("group"))
#if 0
// common clean up
wxWindowBase::~wxWindowBase()
{
- wxASSERT_MSG( GetCapture() != this, wxT("attempt to destroy window with mouse capture") );
+ wxASSERT_MSG( !wxMouseCapture::IsInCaptureStack(this),
+ "Destroying window before releasing mouse capture: this "
+ "will result in a crash later." );
// FIXME if these 2 cases result from programming errors in the user code
// we should probably assert here instead of silently fixing them
bool wxWindowBase::Destroy()
{
- SendDestroyEvent();
+ // If our handle is invalid, it means that this window has never been
+ // created, either because creating it failed or, more typically, because
+ // this wxWindow object was default-constructed and its Create() method had
+ // never been called. As we didn't send wxWindowCreateEvent in this case
+ // (which is sent after successful creation), don't send the matching
+ // wxWindowDestroyEvent neither.
+ if ( GetHandle() )
+ SendDestroyEvent();
delete this;
// fits the window around the children
void wxWindowBase::Fit()
{
- if ( !GetChildren().empty() )
- {
- SetSize(GetBestSize());
- }
- //else: do nothing if we have no children
+ SetSize(GetBestSize());
}
// fits virtual size (ie. scrolled area etc.) around children
void wxWindowBase::FitInside()
{
- if ( GetChildren().GetCount() > 0 )
- {
- SetVirtualSize( GetBestVirtualSize() );
- }
+ SetVirtualSize( GetBestVirtualSize() );
}
// On Mac, scrollbars are explicitly children.
wxWindow *win = node->GetData();
if ( !win->IsTopLevel() && win->IsShown()
#if wxUSE_SCROLLBAR
- && !win->IsKindOf(CLASSINFO(wxScrollBar))
+ && !wxDynamicCast(win, wxScrollBar)
#endif
)
realChildCount ++;
return size*2;
}
+bool
+wxWindowBase::InformFirstDirection(int direction,
+ int size,
+ int availableOtherDir)
+{
+ return GetSizer() && GetSizer()->InformFirstDirection(direction,
+ size,
+ availableOtherDir);
+}
+
wxSize wxWindowBase::GetEffectiveMinSize() const
{
// merge the best size with the min size, giving priority to the min size
// it to be used
wxSize size = DoGetBestClientSize();
if ( size != wxDefaultSize )
- {
size += DoGetBorderSize();
+ else
+ size = DoGetBestSize();
- CacheBestSize(size);
- return size;
- }
+ // Ensure that the best size is at least as large as min size.
+ size.IncTo(GetMinSize());
+
+ // And not larger than max size.
+ size.DecToIfSpecified(GetMaxSize());
- return DoGetBestSize();
+ // Finally cache result and return.
+ CacheBestSize(size);
+ return size;
+}
+
+int wxWindowBase::GetBestHeight(int width) const
+{
+ const int height = DoGetBestClientHeight(width);
+
+ return height == wxDefaultCoord
+ ? GetBestSize().y
+ : height + DoGetBorderSize().y;
+}
+
+int wxWindowBase::GetBestWidth(int height) const
+{
+ const int width = DoGetBestClientWidth(height);
+
+ return width == wxDefaultCoord
+ ? GetBestSize().x
+ : width + DoGetBorderSize().x;
}
void wxWindowBase::SetMinSize(const wxSize& minSize)
{
m_minWidth = minSize.x;
m_minHeight = minSize.y;
+
+ InvalidateBestSize();
}
void wxWindowBase::SetMaxSize(const wxSize& maxSize)
{
m_maxWidth = maxSize.x;
m_maxHeight = maxSize.y;
+
+ InvalidateBestSize();
}
void wxWindowBase::SetInitialSize(const wxSize& size)
wxSizeEvent event(GetSize(), GetId());
event.SetEventObject(this);
if ( flags & wxSEND_EVENT_POST )
- wxPostEvent(this, event);
+ wxPostEvent(GetEventHandler(), event);
else
HandleWindowEvent(event);
}
DoEnable(enabled);
#endif // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT)
- OnEnabled(enabled);
-
// Disabling a top level window is typically done when showing a modal
// dialog and we don't need to disable its children in this case, they will
// be logically disabled anyhow (i.e. their IsEnabled() will return false)
// they would still show as enabled even though they wouldn't actually
// accept any input (at least under MSW where children don't accept input
// if any of the windows in their parent chain is enabled).
- //
- // Notice that we must do this even for wxHAS_NATIVE_ENABLED_MANAGEMENT
- // platforms as we still need to call the children OnEnabled() recursively.
+#ifndef wxHAS_NATIVE_ENABLED_MANAGEMENT
for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
node;
node = node->GetNext() )
if ( !child->IsTopLevel() && child->IsThisEnabled() )
child->NotifyWindowOnEnableChange(enabled);
}
+#endif // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT)
}
bool wxWindowBase::Enable(bool enable)
}
// ----------------------------------------------------------------------------
-// reparenting the window
+// Dealing with parents and children.
// ----------------------------------------------------------------------------
+bool wxWindowBase::IsDescendant(wxWindowBase* win) const
+{
+ // Iterate until we find this window in the parent chain or exhaust it.
+ while ( win )
+ {
+ if ( win == this )
+ return true;
+
+ // Stop iterating on reaching the top level window boundary.
+ if ( win->IsTopLevel() )
+ break;
+
+ win = win->GetParent();
+ }
+
+ return false;
+}
+
void wxWindowBase::AddChild(wxWindowBase *child)
{
wxCHECK_RET( child, wxT("can't add a NULL child") );
child->SetParent(NULL);
}
+void wxWindowBase::SetParent(wxWindowBase *parent)
+{
+ // This assert catches typos which may result in using "this" instead of
+ // "parent" when creating the window. This doesn't happen often but when it
+ // does the results are unpleasant because the program typically just
+ // crashes when due to a stack overflow or something similar and this
+ // assert doesn't cost much (OTOH doing a more general check that the
+ // parent is not one of our children would be more expensive and probably
+ // not worth it).
+ wxASSERT_MSG( parent != this, wxS("Can't use window as its own parent") );
+
+ m_parent = (wxWindow *)parent;
+}
+
bool wxWindowBase::Reparent(wxWindowBase *newParent)
{
wxWindow *oldParent = GetParent();
"the first handler of the wxWindow stack should have non-NULL next handler" );
firstHandler->SetNextHandler(NULL);
- secondHandler->SetPreviousHandler(NULL);
+
+ // It is harmless but useless to unset the previous handler of the window
+ // itself as it's always NULL anyhow, so don't do this.
+ if ( secondHandler != this )
+ secondHandler->SetPreviousHandler(NULL);
// now firstHandler is completely unlinked; set secondHandler as the new window event handler
SetEventHandler(secondHandler);
// wxWidgets versions where GetBackgroundColour() always returned
// something -- so give them something even if it doesn't make sense
// for this window (e.g. it has a themed background)
- if ( !colBg.Ok() )
+ if ( !colBg.IsOk() )
colBg = GetClassDefaultAttributes().colBg;
return colBg;
wxColour wxWindowBase::GetForegroundColour() const
{
// logic is the same as above
- if ( !m_hasFgCol && !m_foregroundColour.Ok() )
+ if ( !m_hasFgCol && !m_foregroundColour.IsOk() )
{
wxColour colFg = GetDefaultAttributes().colFg;
return m_foregroundColour;
}
+bool wxWindowBase::SetBackgroundStyle(wxBackgroundStyle style)
+{
+ // The checks below shouldn't be triggered if we're not really changing the
+ // style.
+ if ( style == m_backgroundStyle )
+ return true;
+
+ // Transparent background style can be only set before creation because of
+ // wxGTK limitation.
+ wxCHECK_MSG( (style != wxBG_STYLE_TRANSPARENT) || !GetHandle(),
+ false,
+ "wxBG_STYLE_TRANSPARENT style can only be set before "
+ "Create()-ing the window." );
+
+ // And once it is set, wxBG_STYLE_TRANSPARENT can't be unset.
+ wxCHECK_MSG( (m_backgroundStyle != wxBG_STYLE_TRANSPARENT) ||
+ (style == wxBG_STYLE_TRANSPARENT),
+ false,
+ "wxBG_STYLE_TRANSPARENT can't be unset once it was set." );
+
+ m_backgroundStyle = style;
+
+ return true;
+}
+
+bool wxWindowBase::IsTransparentBackgroundSupported(wxString *reason) const
+{
+ if ( reason )
+ *reason = _("This platform does not support background transparency.");
+
+ return false;
+}
+
bool wxWindowBase::SetBackgroundColour( const wxColour &colour )
{
if ( colour == m_backgroundColour )
m_inheritBgCol = m_hasBgCol;
m_backgroundColour = colour;
- SetThemeEnabled( !m_hasBgCol && !m_foregroundColour.Ok() );
+ SetThemeEnabled( !m_hasBgCol && !m_foregroundColour.IsOk() );
return true;
}
m_hasFgCol = colour.IsOk();
m_inheritFgCol = m_hasFgCol;
m_foregroundColour = colour;
- SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.Ok() );
+ SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.IsOk() );
return true;
}
// dialog oriented functions
// ----------------------------------------------------------------------------
+#if WXWIN_COMPATIBILITY_2_8
void wxWindowBase::MakeModal(bool modal)
{
// Disable all other windows
}
}
}
+#endif // WXWIN_COMPATIBILITY_2_8
+
+#if wxUSE_VALIDATORS
+
+namespace
+{
+
+// This class encapsulates possibly recursive iteration on window children done
+// by Validate() and TransferData{To,From}Window() and allows to avoid code
+// duplication in all three functions.
+class ValidationTraverserBase
+{
+public:
+ wxEXPLICIT ValidationTraverserBase(wxWindowBase* win)
+ : m_win(static_cast<wxWindow*>(win))
+ {
+ }
+
+ // Traverse all the direct children calling OnDo() on them and also all
+ // grandchildren if wxWS_EX_VALIDATE_RECURSIVELY is used, calling
+ // OnRecurse() for them.
+ bool DoForAllChildren()
+ {
+ const bool recurse = m_win->HasExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY);
+
+ wxWindowList& children = m_win->GetChildren();
+ for ( wxWindowList::iterator i = children.begin();
+ i != children.end();
+ ++i )
+ {
+ wxWindow* const child = static_cast<wxWindow*>(*i);
+ wxValidator* const validator = child->GetValidator();
+ if ( validator && !OnDo(validator) )
+ {
+ return false;
+ }
+
+ // Notice that validation should never recurse into top level
+ // children, e.g. some other dialog which might happen to be
+ // currently shown.
+ if ( recurse && !child->IsTopLevel() && !OnRecurse(child) )
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ // Give it a virtual dtor just to suppress gcc warnings about a class with
+ // virtual methods but non-virtual dtor -- even if this is completely safe
+ // here as we never use the objects of this class polymorphically.
+ virtual ~ValidationTraverserBase() { }
+
+protected:
+ // Called for each child, validator is guaranteed to be non-NULL.
+ virtual bool OnDo(wxValidator* validator) = 0;
+
+ // Called for each child if we need to recurse into its children.
+ virtual bool OnRecurse(wxWindow* child) = 0;
+
+
+ // The window whose children we're traversing.
+ wxWindow* const m_win;
+
+ wxDECLARE_NO_COPY_CLASS(ValidationTraverserBase);
+};
+
+} // anonymous namespace
+
+#endif // wxUSE_VALIDATORS
bool wxWindowBase::Validate()
{
#if wxUSE_VALIDATORS
- bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
-
- wxWindowList::compatibility_iterator node;
- for ( node = m_children.GetFirst(); node; node = node->GetNext() )
+ class ValidateTraverser : public ValidationTraverserBase
{
- wxWindowBase *child = node->GetData();
- wxValidator *validator = child->GetValidator();
- if ( validator && !validator->Validate((wxWindow *)this) )
+ public:
+ wxEXPLICIT ValidateTraverser(wxWindowBase* win)
+ : ValidationTraverserBase(win)
{
- return false;
}
- if ( recurse && !child->Validate() )
+ virtual bool OnDo(wxValidator* validator)
{
- return false;
+ return validator->Validate(m_win);
}
- }
-#endif // wxUSE_VALIDATORS
+ virtual bool OnRecurse(wxWindow* child)
+ {
+ return child->Validate();
+ }
+ };
+
+ return ValidateTraverser(this).DoForAllChildren();
+#else // !wxUSE_VALIDATORS
return true;
+#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
}
bool wxWindowBase::TransferDataToWindow()
{
#if wxUSE_VALIDATORS
- bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
-
- wxWindowList::compatibility_iterator node;
- for ( node = m_children.GetFirst(); node; node = node->GetNext() )
+ class DataToWindowTraverser : public ValidationTraverserBase
{
- wxWindowBase *child = node->GetData();
- wxValidator *validator = child->GetValidator();
- if ( validator && !validator->TransferToWindow() )
+ public:
+ wxEXPLICIT DataToWindowTraverser(wxWindowBase* win)
+ : ValidationTraverserBase(win)
{
- wxLogWarning(_("Could not transfer data to window"));
-#if wxUSE_LOG
- wxLog::FlushActive();
-#endif // wxUSE_LOG
-
- return false;
}
- if ( recurse )
+ virtual bool OnDo(wxValidator* validator)
{
- if ( !child->TransferDataToWindow() )
+ if ( !validator->TransferToWindow() )
{
- // warning already given
+ wxLogWarning(_("Could not transfer data to window"));
+#if wxUSE_LOG
+ wxLog::FlushActive();
+#endif // wxUSE_LOG
+
return false;
}
+
+ return true;
}
- }
-#endif // wxUSE_VALIDATORS
+ virtual bool OnRecurse(wxWindow* child)
+ {
+ return child->TransferDataToWindow();
+ }
+ };
+
+ return DataToWindowTraverser(this).DoForAllChildren();
+#else // !wxUSE_VALIDATORS
return true;
+#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
}
bool wxWindowBase::TransferDataFromWindow()
{
#if wxUSE_VALIDATORS
- bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
-
- wxWindowList::compatibility_iterator node;
- for ( node = m_children.GetFirst(); node; node = node->GetNext() )
+ class DataFromWindowTraverser : public ValidationTraverserBase
{
- wxWindow *child = node->GetData();
- wxValidator *validator = child->GetValidator();
- if ( validator && !validator->TransferFromWindow() )
+ public:
+ DataFromWindowTraverser(wxWindowBase* win)
+ : ValidationTraverserBase(win)
{
- // nop warning here because the application is supposed to give
- // one itself - we don't know here what might have gone wrongly
+ }
- return false;
+ virtual bool OnDo(wxValidator* validator)
+ {
+ return validator->TransferFromWindow();
}
- if ( recurse )
+ virtual bool OnRecurse(wxWindow* child)
{
- if ( !child->TransferDataFromWindow() )
- {
- // warning already given
- return false;
- }
+ return child->TransferDataFromWindow();
}
- }
-#endif // wxUSE_VALIDATORS
+ };
+ return DataFromWindowTraverser(this).DoForAllChildren();
+#else // !wxUSE_VALIDATORS
return true;
+#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
}
void wxWindowBase::InitDialog()
}
}
+bool wxWindowBase::CopyToolTip(wxToolTip *tip)
+{
+ SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL);
+
+ return tip != NULL;
+}
+
#endif // wxUSE_TOOLTIPS
// ----------------------------------------------------------------------------
{
if ( c )
{
- if ( c->left.GetOtherWindow() && (c->top.GetOtherWindow() != this) )
+ if ( c->left.GetOtherWindow() && (c->left.GetOtherWindow() != this) )
c->left.GetOtherWindow()->RemoveConstraintReference(this);
if ( c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this) )
c->top.GetOtherWindow()->RemoveConstraintReference(this);
wxLayoutConstraints *constr = GetConstraints();
if ( constr && constr->AreSatisfied() )
{
+ ChildrenRepositioningGuard repositionGuard(this);
+
int x = constr->left.GetValue();
int y = constr->top.GetValue();
int w = constr->width.GetValue();
void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) const
{
- // don't do it for the dialogs/frames - they float independently of their
- // parent
- if ( !IsTopLevel() )
+ wxWindow *parent = GetParent();
+ if ( !(sizeFlags & wxSIZE_NO_ADJUSTMENTS) && parent )
{
- wxWindow *parent = GetParent();
- if ( !(sizeFlags & wxSIZE_NO_ADJUSTMENTS) && parent )
- {
- wxPoint pt(parent->GetClientAreaOrigin());
- x += pt.x;
- y += pt.y;
- }
+ wxPoint pt(parent->GetClientAreaOrigin());
+ x += pt.x;
+ y += pt.y;
}
}
Show(event.GetShown());
}
+// ----------------------------------------------------------------------------
+// Idle processing
+// ----------------------------------------------------------------------------
+
+// Send idle event to window and all subwindows
+bool wxWindowBase::SendIdleEvents(wxIdleEvent& event)
+{
+ bool needMore = false;
+
+ OnInternalIdle();
+
+ // should we send idle event to this window?
+ if (wxIdleEvent::GetMode() == wxIDLE_PROCESS_ALL ||
+ HasExtraStyle(wxWS_EX_PROCESS_IDLE))
+ {
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
+
+ if (event.MoreRequested())
+ needMore = true;
+ }
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+ for (; node; node = node->GetNext())
+ {
+ wxWindow* child = node->GetData();
+ if (child->SendIdleEvents(event))
+ needMore = true;
+ }
+
+ return needMore;
+}
+
+void wxWindowBase::OnInternalIdle()
+{
+ if ( wxUpdateUIEvent::CanUpdate(this) )
+ UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+}
+
// ----------------------------------------------------------------------------
// dialog units translations
// ----------------------------------------------------------------------------
{
const wxWindowBase * const parent = wxGetTopLevelParent((wxWindow*)this);
+ wxCHECK_MSG( parent, wxDefaultSize, wxS("Must have TLW parent") );
+
if ( !parent->m_font.IsOk() )
{
// Default GUI font is used. This is the most common case, so
{
gs_popupMenuSelection = wxID_NONE;
- Connect(wxEVT_COMMAND_MENU_SELECTED,
+ Connect(wxEVT_MENU,
wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu),
NULL,
this);
wxUpdateUIEventHandler(wxWindowBase::InternalOnPopupMenuUpdate),
NULL,
this);
- Disconnect(wxEVT_COMMAND_MENU_SELECTED,
+ Disconnect(wxEVT_MENU,
wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu),
NULL,
this);
// list classes implementation
// ----------------------------------------------------------------------------
-#if wxUSE_STL
+#if wxUSE_STD_CONTAINERS
#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxWindowList)
-#else // !wxUSE_STL
+#else // !wxUSE_STD_CONTAINERS
void wxWindowListNode::DeleteData()
{
delete (wxWindow *)GetData();
}
-#endif // wxUSE_STL/!wxUSE_STL
+#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS
// ----------------------------------------------------------------------------
// borders
// mouse capture
// ----------------------------------------------------------------------------
-struct WXDLLEXPORT wxWindowNext
+// Private data used for mouse capture tracking.
+namespace wxMouseCapture
{
- wxWindow *win;
- wxWindowNext *next;
-} *wxWindowBase::ms_winCaptureNext = NULL;
-wxWindow *wxWindowBase::ms_winCaptureCurrent = NULL;
-bool wxWindowBase::ms_winCaptureChanging = false;
+
+// Stack of the windows which previously had the capture, the top most element
+// is the window that has the mouse capture now.
+//
+// NB: We use wxVector and not wxStack to be able to examine all of the stack
+// elements for debug checks, but only the stack operations should be
+// performed with this vector.
+wxVector<wxWindow*> stack;
+
+// Flag preventing reentrancy in {Capture,Release}Mouse().
+wxRecursionGuardFlag changing;
+
+bool IsInCaptureStack(wxWindowBase* win)
+{
+ for ( wxVector<wxWindow*>::const_iterator it = stack.begin();
+ it != stack.end();
+ ++it )
+ {
+ if ( *it == win )
+ return true;
+ }
+
+ return false;
+}
+
+} // wxMouseCapture
void wxWindowBase::CaptureMouse()
{
wxLogTrace(wxT("mousecapture"), wxT("CaptureMouse(%p)"), static_cast<void*>(this));
- wxASSERT_MSG( !ms_winCaptureChanging, wxT("recursive CaptureMouse call?") );
+ wxRecursionGuard guard(wxMouseCapture::changing);
+ wxASSERT_MSG( !guard.IsInside(), wxT("recursive CaptureMouse call?") );
- ms_winCaptureChanging = true;
+ wxASSERT_MSG( !wxMouseCapture::IsInCaptureStack(this),
+ "Recapturing the mouse in the same window?" );
wxWindow *winOld = GetCapture();
if ( winOld )
- {
((wxWindowBase*) winOld)->DoReleaseMouse();
- // save it on stack
- wxWindowNext *item = new wxWindowNext;
- item->win = winOld;
- item->next = ms_winCaptureNext;
- ms_winCaptureNext = item;
- }
- //else: no mouse capture to save
-
DoCaptureMouse();
- ms_winCaptureCurrent = (wxWindow*)this;
- ms_winCaptureChanging = false;
+ wxMouseCapture::stack.push_back(static_cast<wxWindow*>(this));
}
void wxWindowBase::ReleaseMouse()
{
wxLogTrace(wxT("mousecapture"), wxT("ReleaseMouse(%p)"), static_cast<void*>(this));
- wxASSERT_MSG( !ms_winCaptureChanging, wxT("recursive ReleaseMouse call?") );
-
- wxASSERT_MSG( GetCapture() == this,
- "attempt to release mouse, but this window hasn't captured it" );
- wxASSERT_MSG( ms_winCaptureCurrent == this,
- "attempt to release mouse, but this window hasn't captured it" );
+ wxRecursionGuard guard(wxMouseCapture::changing);
+ wxASSERT_MSG( !guard.IsInside(), wxT("recursive ReleaseMouse call?") );
- ms_winCaptureChanging = true;
+#if wxDEBUG_LEVEL
+ wxWindow* const winCapture = GetCapture();
+ if ( !winCapture )
+ {
+ wxFAIL_MSG
+ (
+ wxString::Format
+ (
+ "Releasing mouse in %p(%s) but it is not captured",
+ this, GetClassInfo()->GetClassName()
+ )
+ );
+ }
+ else if ( winCapture != this )
+ {
+ wxFAIL_MSG
+ (
+ wxString::Format
+ (
+ "Releasing mouse in %p(%s) but it is captured by %p(%s)",
+ this, GetClassInfo()->GetClassName(),
+ winCapture, winCapture->GetClassInfo()->GetClassName()
+ )
+ );
+ }
+#endif // wxDEBUG_LEVEL
DoReleaseMouse();
- ms_winCaptureCurrent = NULL;
- if ( ms_winCaptureNext )
- {
- ((wxWindowBase*)ms_winCaptureNext->win)->DoCaptureMouse();
- ms_winCaptureCurrent = ms_winCaptureNext->win;
+ wxCHECK_RET( !wxMouseCapture::stack.empty(),
+ "Releasing mouse capture but capture stack empty?" );
+ wxCHECK_RET( wxMouseCapture::stack.back() == this,
+ "Window releasing mouse capture not top of capture stack?" );
- wxWindowNext *item = ms_winCaptureNext;
- ms_winCaptureNext = item->next;
- delete item;
- }
- //else: stack is empty, no previous capture
+ wxMouseCapture::stack.pop_back();
- ms_winCaptureChanging = false;
+ // Restore the capture to the previous window, if any.
+ if ( !wxMouseCapture::stack.empty() )
+ {
+ ((wxWindowBase*)wxMouseCapture::stack.back())->DoCaptureMouse();
+ }
wxLogTrace(wxT("mousecapture"),
- (const wxChar *) wxT("After ReleaseMouse() mouse is captured by %p"),
+ wxT("After ReleaseMouse() mouse is captured by %p"),
static_cast<void*>(GetCapture()));
}
{
// don't do anything if capture lost was expected, i.e. resulted from
// a wx call to ReleaseMouse or CaptureMouse:
- if ( ms_winCaptureChanging )
+ wxRecursionGuard guard(wxMouseCapture::changing);
+ if ( guard.IsInside() )
return;
// if the capture was lost unexpectedly, notify every window that has
// capture (on stack or current) about it and clear the stack:
-
- if ( ms_winCaptureCurrent )
- {
- DoNotifyWindowAboutCaptureLost(ms_winCaptureCurrent);
- ms_winCaptureCurrent = NULL;
- }
-
- while ( ms_winCaptureNext )
+ while ( !wxMouseCapture::stack.empty() )
{
- wxWindowNext *item = ms_winCaptureNext;
- ms_winCaptureNext = item->next;
-
- DoNotifyWindowAboutCaptureLost(item->win);
+ DoNotifyWindowAboutCaptureLost(wxMouseCapture::stack.back());
- delete item;
+ wxMouseCapture::stack.pop_back();
}
}
wxWindow *parent = GetParent();
if ( parent && !parent->IsBeingDeleted() )
{
- wxPropagateOnce propagateOnce(event);
+ wxPropagateOnce propagateOnce(event, this);
return parent->GetEventHandler()->ProcessEvent(event);
}
wxWindowList::compatibility_iterator i = siblings.Find(win);
wxCHECK_RET( i, wxT("MoveBefore/AfterInTabOrder(): win is not a sibling") );
- // unfortunately, when wxUSE_STL == 1 DetachNode() is not implemented so we
- // can't just move the node around
+ // unfortunately, when wxUSE_STD_CONTAINERS == 1 DetachNode() is not
+ // implemented so we can't just move the node around
wxWindow *self = (wxWindow *)this;
siblings.DeleteObject(self);
if ( move == OrderAfter )
bool wxWindowBase::HasFocus() const
{
- wxWindowBase *win = DoFindFocus();
- return win == this ||
- win == wxConstCast(this, wxWindowBase)->GetMainWindowOfCompositeControl();
+ wxWindowBase* const win = DoFindFocus();
+ return win &&
+ (this == win || this == win->GetMainWindowOfCompositeControl());
}
// ----------------------------------------------------------------------------
if (win)
{
rect = win->GetRect();
- if (win->GetParent() && !win->IsKindOf(CLASSINFO(wxTopLevelWindow)))
+ if (win->GetParent() && !wxDynamicCast(win, wxTopLevelWindow))
rect.SetPosition(win->GetParent()->ClientToScreen(rect.GetPosition()));
return wxACC_OK;
}
// accessible classes, one for each kind of wxWidgets
// control or window.
#if wxUSE_BUTTON
- if (GetWindow()->IsKindOf(CLASSINFO(wxButton)))
+ if (wxDynamicCast(GetWindow(), wxButton))
title = ((wxButton*) GetWindow())->GetLabel();
else
#endif
if (childId > 0)
return wxACC_NOT_IMPLEMENTED;
- if (GetWindow()->IsKindOf(CLASSINFO(wxControl)))
+ if (wxDynamicCast(GetWindow(), wxControl))
return wxACC_NOT_IMPLEMENTED;
#if wxUSE_STATUSBAR
- if (GetWindow()->IsKindOf(CLASSINFO(wxStatusBar)))
+ if (wxDynamicCast(GetWindow(), wxStatusBar))
return wxACC_NOT_IMPLEMENTED;
#endif
#if wxUSE_TOOLBAR
- if (GetWindow()->IsKindOf(CLASSINFO(wxToolBar)))
+ if (wxDynamicCast(GetWindow(), wxToolBar))
return wxACC_NOT_IMPLEMENTED;
#endif
if (childId > 0)
return wxACC_NOT_IMPLEMENTED;
- if (GetWindow()->IsKindOf(CLASSINFO(wxControl)))
+ if (wxDynamicCast(GetWindow(), wxControl))
return wxACC_NOT_IMPLEMENTED;
#if wxUSE_STATUSBAR
- if (GetWindow()->IsKindOf(CLASSINFO(wxStatusBar)))
+ if (wxDynamicCast(GetWindow(), wxStatusBar))
return wxACC_NOT_IMPLEMENTED;
#endif
#if wxUSE_TOOLBAR
- if (GetWindow()->IsKindOf(CLASSINFO(wxToolBar)))
+ if (wxDynamicCast(GetWindow(), wxToolBar))
return wxACC_NOT_IMPLEMENTED;
#endif
projects / wxWidgets.git / blobdiff