// 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 ++;
// 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
{
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)
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)
// Iterate until we find this window in the parent chain or exhaust it.
while ( win )
{
- wxWindow* const parent = win->GetParent();
- if ( parent == this )
+ if ( win == this )
return true;
// Stop iterating on reaching the top level window boundary.
- if ( parent->IsTopLevel() )
+ if ( win->IsTopLevel() )
break;
- win = parent;
+ win = win->GetParent();
}
return false;
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);
}
#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()
{
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();
{
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);
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