X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30915cf22f6fb91ccd3cf2c0c9e954ae3a4fdb13..76015a6bb79156d8af1b5e8b4b8e46b4e192d18f:/src/common/wincmn.cpp diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 8c987ef135..3c2c0f4e1d 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -1149,8 +1149,6 @@ void wxWindowBase::NotifyWindowOnEnableChange(bool enabled) 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) @@ -1166,9 +1164,7 @@ void wxWindowBase::NotifyWindowOnEnableChange(bool enabled) // 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() ) @@ -1177,6 +1173,7 @@ void wxWindowBase::NotifyWindowOnEnableChange(bool enabled) if ( !child->IsTopLevel() && child->IsThisEnabled() ) child->NotifyWindowOnEnableChange(enabled); } +#endif // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT) } bool wxWindowBase::Enable(bool enable) @@ -1991,95 +1988,168 @@ void wxWindowBase::MakeModal(bool modal) } #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(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(*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() @@ -2540,6 +2610,8 @@ void wxWindowBase::SetConstraintSizes(bool recurse) 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(); @@ -2888,7 +2960,7 @@ wxWindowBase::DoGetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y) { gs_popupMenuSelection = wxID_NONE; - Connect(wxEVT_COMMAND_MENU_SELECTED, + Connect(wxEVT_MENU, wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu), NULL, this); @@ -2911,7 +2983,7 @@ wxWindowBase::DoGetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y) wxUpdateUIEventHandler(wxWindowBase::InternalOnPopupMenuUpdate), NULL, this); - Disconnect(wxEVT_COMMAND_MENU_SELECTED, + Disconnect(wxEVT_MENU, wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu), NULL, this);