X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/789295bf7bd4b58b0270800fb689fce0786dae15..d78b3d64143f165857922e1e695ba4164d61869f:/src/common/wincmn.cpp?ds=inline diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 8fb0eaabde..2665e8d0ec 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -107,8 +107,10 @@ void wxWindowBase::InitBase() // the default event handler is just this window m_eventHandler = this; +#if wxUSE_VALIDATORS // no validator m_windowValidator = (wxValidator *) NULL; +#endif // wxUSE_VALIDATORS // use the system default colours wxSystemSettings settings; @@ -189,13 +191,25 @@ wxWindowBase::~wxWindowBase() wxASSERT_MSG( GetChildren().GetCount() == 0, _T("children not destroyed") ); + // make sure that there are no dangling pointers left pointing to us + wxPanel *panel = wxDynamicCast(GetParent(), wxPanel); + if ( panel ) + { + if ( panel->GetLastFocus() == this ) + { + panel->SetLastFocus((wxWindow *)NULL); + } + } + #if wxUSE_CARET if ( m_caret ) delete m_caret; #endif // wxUSE_CARET +#if wxUSE_VALIDATORS if ( m_windowValidator ) delete m_windowValidator; +#endif // wxUSE_VALIDATORS if ( m_clientObject ) delete m_clientObject; @@ -312,20 +326,48 @@ void wxWindowBase::Centre(int direction) Move(new_x, new_y); } +// Center TopLevel windows over thier parent instead of the whole screen +void wxWindowBase::CentreOnParent(int direction) +{ + wxPoint ppos; + wxSize psze; + wxSize wsze; + wxWindow* parent = GetParent(); + int x, y; + + if (!parent || !IsTopLevel()) { + Centre(direction); + return; + } + + psze = parent->GetSize(); + ppos = parent->ClientToScreen(wxPoint(0,0)); + wsze = GetSize(); + + x = y = -1; + + if (direction == wxBOTH || direction == wxHORIZONTAL) + x = ppos.x + (psze.x - wsze.x)/2; + if (direction == wxBOTH || direction == wxVERTICAL) + y = ppos.y + (psze.y - wsze.y)/2; + + Move(x, y); +} + // fits the window around the children void wxWindowBase::Fit() { int maxX = 0, maxY = 0; - wxWindowList::Node *node = GetChildren().GetFirst(); - while ( node ) + for ( wxWindowList::Node *node = GetChildren().GetFirst(); + node; + node = node->GetNext() ) { wxWindow *win = node->GetData(); - if ( win->IsKindOf(CLASSINFO(wxFrame)) || - win->IsKindOf(CLASSINFO(wxDialog)) ) + if ( win->IsTopLevel() ) { - // dialogs and frames line in different top level windows - don't + // dialogs and frames lie in different top level windows - don't // deal with them here continue; } @@ -337,8 +379,6 @@ void wxWindowBase::Fit() maxX = wx + ww; if ( wy + wh > maxY ) maxY = wy + wh; - - node = node->GetNext(); } // leave a margin @@ -388,6 +428,14 @@ bool wxWindowBase::Enable(bool enable) return FALSE; } } +// ---------------------------------------------------------------------------- +// RTTI +// ---------------------------------------------------------------------------- + +bool wxWindowBase::IsTopLevel() const +{ + return wxDynamicCast(this, wxFrame) || wxDynamicCast(this, wxDialog); +} // ---------------------------------------------------------------------------- // reparenting the window @@ -538,11 +586,12 @@ void wxWindowBase::SetCaret(wxCaret *caret) if ( m_caret ) { wxASSERT_MSG( m_caret->GetWindow() == this, - "caret should be created associated to this window" ); + _T("caret should be created associated to this window") ); } } #endif // wxUSE_CARET +#if wxUSE_VALIDATORS // ---------------------------------------------------------------------------- // validators // ---------------------------------------------------------------------------- @@ -557,6 +606,7 @@ void wxWindowBase::SetValidator(const wxValidator& validator) if ( m_windowValidator ) m_windowValidator->SetWindow(this) ; } +#endif // wxUSE_VALIDATORS // ---------------------------------------------------------------------------- // update region testing @@ -612,29 +662,44 @@ wxWindow *wxWindowBase::FindWindow( const wxString& name ) // dialog oriented functions // ---------------------------------------------------------------------------- -void wxWindowBase::MakeModal(bool WXUNUSED(modal)) +void wxWindowBase::MakeModal(bool modal) { - wxFAIL_MSG(_T("TODO")); + // Disable all other windows + if ( IsTopLevel() ) + { + wxWindowList::Node *node = wxTopLevelWindows.GetFirst(); + while (node) + { + wxWindow *win = node->GetData(); + if (win != this) + win->Enable(!modal); + + node = node->GetNext(); + } + } } bool wxWindowBase::Validate() { +#if wxUSE_VALIDATORS wxWindowList::Node *node; for ( node = m_children.GetFirst(); node; node = node->GetNext() ) { wxWindowBase *child = node->GetData(); wxValidator *validator = child->GetValidator(); - if ( validator && validator->Validate(this) ) + if ( validator && !validator->Validate((wxWindow *)this) ) { return FALSE; } } +#endif // wxUSE_VALIDATORS return TRUE; } bool wxWindowBase::TransferDataToWindow() { +#if wxUSE_VALIDATORS wxWindowList::Node *node; for ( node = m_children.GetFirst(); node; node = node->GetNext() ) { @@ -652,12 +717,14 @@ bool wxWindowBase::TransferDataToWindow() return FALSE; } } +#endif // wxUSE_VALIDATORS return TRUE; } bool wxWindowBase::TransferDataFromWindow() { +#if wxUSE_VALIDATORS wxWindowList::Node *node; for ( node = m_children.GetFirst(); node; node = node->GetNext() ) { @@ -668,6 +735,7 @@ bool wxWindowBase::TransferDataFromWindow() return FALSE; } } +#endif // wxUSE_VALIDATORS return TRUE; } @@ -902,7 +970,7 @@ bool wxWindowBase::DoPhase(int phase) while (node) { wxWindow *child = node->GetData(); - if ( !child->IsKindOf(CLASSINFO(wxFrame)) && !child->IsKindOf(CLASSINFO(wxDialog)) ) + if ( !child->IsTopLevel() ) { wxLayoutConstraints *constr = child->GetConstraints(); if ( constr ) @@ -946,7 +1014,7 @@ void wxWindowBase::ResetConstraints() while (node) { wxWindow *win = node->GetData(); - if ( !win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)) ) + if ( !win->IsTopLevel() ) win->ResetConstraints(); node = node->GetNext(); } @@ -1003,7 +1071,7 @@ void wxWindowBase::SetConstraintSizes(bool recurse) while (node) { wxWindow *win = node->GetData(); - if ( !win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)) ) + if ( !win->IsTopLevel() ) win->SetConstraintSizes(); node = node->GetNext(); } @@ -1014,8 +1082,7 @@ void wxWindowBase::SetConstraintSizes(bool recurse) // this window. void wxWindowBase::TransformSizerToActual(int *x, int *y) const { - if ( !m_sizerParent || m_sizerParent->IsKindOf(CLASSINFO(wxDialog) ) || - m_sizerParent->IsKindOf(CLASSINFO(wxFrame)) ) + if ( !m_sizerParent || m_sizerParent->IsTopLevel() ) return; int xp, yp; @@ -1147,19 +1214,30 @@ void wxWindowBase::UpdateWindowUI() if ( event.GetSetEnabled() ) Enable(event.GetEnabled()); - if ( event.GetSetText() && IsKindOf(CLASSINFO(wxControl)) ) - ((wxControl*)this)->SetLabel(event.GetText()); + if ( event.GetSetText() ) + { + wxControl *control = wxDynamicCast(this, wxControl); + if ( control ) + control->SetLabel(event.GetText()); + } - if ( IsKindOf(CLASSINFO(wxCheckBox)) ) +#if wxUSE_CHECKBOX + wxCheckBox *checkbox = wxDynamicCast(this, wxCheckBox); + if ( checkbox ) { if ( event.GetSetChecked() ) - ((wxCheckBox *)this)->SetValue(event.GetChecked()); + checkbox->SetValue(event.GetChecked()); } - else if ( IsKindOf(CLASSINFO(wxRadioButton)) ) +#endif // wxUSE_CHECKBOX + +#if wxUSE_RADIOBUTTON + wxRadioButton *radiobtn = wxDynamicCast(this, wxRadioButton); + if ( radiobtn ) { if ( event.GetSetChecked() ) - ((wxRadioButton *) this)->SetValue(event.GetChecked()); + radiobtn->SetValue(event.GetChecked()); } +#endif // wxUSE_RADIOBUTTON } } }