X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d99be5f5381dad56492da02c2df1c3ec0750926..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/common/wincmn.cpp diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 13c3f639ab..18e1821bfc 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -37,12 +37,14 @@ #include "wx/window.h" #include "wx/checkbox.h" #include "wx/radiobut.h" + #include "wx/textctrl.h" #include "wx/settings.h" #include "wx/dialog.h" #endif //WX_PRECOMP #if wxUSE_CONSTRAINTS #include "wx/layout.h" + #include "wx/sizer.h" #endif // wxUSE_CONSTRAINTS #if wxUSE_DRAG_AND_DROP @@ -117,8 +119,11 @@ void wxWindowBase::InitBase() m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_BTNFACE); m_foregroundColour = *wxBLACK; // TODO take this from sys settings too? +#ifndef __WXMAC__ m_font = *wxSWISS_FONT; // and this? - +#else + m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT); +#endif // no style bits m_windowStyle = 0; @@ -131,7 +136,6 @@ void wxWindowBase::InitBase() m_constraints = (wxLayoutConstraints *) NULL; m_constraintsInvolvedIn = (wxWindowList *) NULL; m_windowSizer = (wxSizer *) NULL; - m_sizerParent = (wxWindowBase *) NULL; m_autoLayout = FALSE; #endif // wxUSE_CONSTRAINTS @@ -154,13 +158,19 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent, const wxPoint& WXUNUSED(pos), const wxSize& WXUNUSED(size), long style, +#if wxUSE_VALIDATORS +# if defined(__VISAGECPP__) + const wxValidator* validator, +# else const wxValidator& validator, +# endif +#endif const wxString& name) { // m_isWindow is set to TRUE in wxWindowBase::Init() as well as many other // member variables - check that it has been called (will catch the case // when a new ctor is added which doesn't call InitWindow) - wxASSERT_MSG( m_isWindow, _T("Init() must have been called before!") ); + wxASSERT_MSG( m_isWindow, wxT("Init() must have been called before!") ); // generate a new id if the user doesn't care about it m_windowId = id == -1 ? NewControlId() : id; @@ -191,7 +201,7 @@ wxWindowBase::~wxWindowBase() // we weren't a dialog class wxTopLevelWindows.DeleteObject(this); - wxASSERT_MSG( GetChildren().GetCount() == 0, _T("children not destroyed") ); + wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") ); // make sure that there are no dangling pointers left pointing to us wxPanel *panel = wxDynamicCast(GetParent(), wxPanel); @@ -213,7 +223,8 @@ wxWindowBase::~wxWindowBase() delete m_windowValidator; #endif // wxUSE_VALIDATORS - if ( m_clientObject ) + // we only delete object data, not untyped + if ( m_clientDataType == ClientData_Object ) delete m_clientObject; #if wxUSE_CONSTRAINTS @@ -233,9 +244,6 @@ wxWindowBase::~wxWindowBase() if ( m_windowSizer ) delete m_windowSizer; - // If this is a child of a sizer, remove self from parent - if ( m_sizerParent ) - m_sizerParent->RemoveChild(this); #endif // wxUSE_CONSTRAINTS #if wxUSE_DRAG_AND_DROP @@ -282,12 +290,12 @@ bool wxWindowBase::DestroyChildren() wxWindow *child = node->GetData(); - wxASSERT_MSG( child, _T("children list contains empty nodes") ); + wxASSERT_MSG( child, wxT("children list contains empty nodes") ); delete child; wxASSERT_MSG( !GetChildren().Find(child), - _T("child didn't remove itself using RemoveChild()") ); + wxT("child didn't remove itself using RemoveChild()") ); } return TRUE; @@ -303,15 +311,22 @@ void wxWindowBase::Centre(int direction) int widthParent, heightParent; wxWindow *parent = GetParent(); - if ( parent ) + if ( !parent ) { - parent->GetClientSize(&widthParent, &heightParent); + // no other choice + direction |= wxCENTRE_ON_SCREEN; } - else + + if ( direction & wxCENTRE_ON_SCREEN ) { // centre with respect to the whole screen wxDisplaySize(&widthParent, &heightParent); } + else + { + // centre inside the parents rectangle + parent->GetClientSize(&widthParent, &heightParent); + } int width, height; GetSize(&width, &height); @@ -327,8 +342,11 @@ void wxWindowBase::Centre(int direction) // controls are always centered on their parent because it doesn't make // sense to centre them on the screen - if ( (direction & wxCENTER_FRAME) || wxDynamicCast(this, wxControl) ) + if ( !(direction & wxCENTRE_ON_SCREEN) || wxDynamicCast(this, wxControl) ) { + // theo nly chance to get this is to have a wxControl without parent + wxCHECK_RET( parent, wxT("a control must have a parent") ); + // adjust to the parents client area origin wxPoint posParent = parent->ClientToScreen(wxPoint(0, 0)); @@ -336,6 +354,7 @@ void wxWindowBase::Centre(int direction) yNew += posParent.y; } + // move the centre of this window to this position Move(xNew, yNew); } @@ -419,7 +438,7 @@ bool wxWindowBase::Enable(bool enable) bool wxWindowBase::IsTopLevel() const { - return wxDynamicCast(this, wxFrame) || wxDynamicCast(this, wxDialog); + return FALSE; } // ---------------------------------------------------------------------------- @@ -428,7 +447,7 @@ bool wxWindowBase::IsTopLevel() const void wxWindowBase::AddChild(wxWindowBase *child) { - wxCHECK_RET( child, _T("can't add a NULL child") ); + wxCHECK_RET( child, wxT("can't add a NULL child") ); GetChildren().Append(child); child->SetParent(this); @@ -436,7 +455,7 @@ void wxWindowBase::AddChild(wxWindowBase *child) void wxWindowBase::RemoveChild(wxWindowBase *child) { - wxCHECK_RET( child, _T("can't remove a NULL child") ); + wxCHECK_RET( child, wxT("can't remove a NULL child") ); GetChildren().DeleteObject(child); child->SetParent((wxWindow *)NULL); @@ -531,7 +550,7 @@ bool wxWindowBase::SetCursor(const wxCursor& cursor) // don't try to set invalid cursor, always fall back to the default const wxCursor& cursorOk = cursor.Ok() ? cursor : *wxSTANDARD_CURSOR; - if ( cursorOk == m_cursor ) + if ( (wxCursor&)cursorOk == m_cursor ) { // no change return FALSE; @@ -547,7 +566,7 @@ bool wxWindowBase::SetFont(const wxFont& font) // don't try to set invalid font, always fall back to the default const wxFont& fontOk = font.Ok() ? font : *wxSWISS_FONT; - if ( fontOk == m_font ) + if ( (wxFont&)fontOk == m_font ) { // no change return FALSE; @@ -571,7 +590,7 @@ void wxWindowBase::SetCaret(wxCaret *caret) if ( m_caret ) { wxASSERT_MSG( m_caret->GetWindow() == this, - _T("caret should be created associated to this window") ); + wxT("caret should be created associated to this window") ); } } #endif // wxUSE_CARET @@ -581,6 +600,18 @@ void wxWindowBase::SetCaret(wxCaret *caret) // validators // ---------------------------------------------------------------------------- +# if defined(__VISAGECPP__) +void wxWindowBase::SetValidator(const wxValidator* validator) +{ + if ( m_windowValidator ) + delete m_windowValidator; + + m_windowValidator = (wxValidator *)validator->Clone(); + + if ( m_windowValidator ) + m_windowValidator->SetWindow(this) ; +} +# else void wxWindowBase::SetValidator(const wxValidator& validator) { if ( m_windowValidator ) @@ -591,6 +622,7 @@ void wxWindowBase::SetValidator(const wxValidator& validator) if ( m_windowValidator ) m_windowValidator->SetWindow(this) ; } +# endif // __VISAGECPP__ #endif // wxUSE_VALIDATORS // ---------------------------------------------------------------------------- @@ -878,39 +910,35 @@ void wxWindowBase::DeleteRelatedConstraints() void wxWindowBase::SetSizer(wxSizer *sizer) { + if (m_windowSizer) delete m_windowSizer; + m_windowSizer = sizer; - if ( sizer ) - sizer->SetSizerParent(this); } bool wxWindowBase::Layout() { - if ( GetConstraints() ) - { - int w, h; - GetClientSize(&w, &h); - GetConstraints()->width.SetValue(w); - GetConstraints()->height.SetValue(h); - } + int w, h; + GetClientSize(&w, &h); - // If top level (one sizer), evaluate the sizer's constraints. + // If there is a sizer, use it instead of the constraints if ( GetSizer() ) { - int noChanges; - GetSizer()->ResetConstraints(); // Mark all constraints as unevaluated - GetSizer()->LayoutPhase1(&noChanges); - GetSizer()->LayoutPhase2(&noChanges); - GetSizer()->SetConstraintSizes(); // Recursively set the real window sizes + GetSizer()->SetDimension( 0, 0, w, h ); return TRUE; } - else + + if ( GetConstraints() ) { - // Otherwise, evaluate child constraints - ResetConstraints(); // Mark all constraints as unevaluated - DoPhase(1); // Just one phase need if no sizers involved - DoPhase(2); - SetConstraintSizes(); // Recursively set the real window sizes + GetConstraints()->width.SetValue(w); + GetConstraints()->height.SetValue(h); } + + // Evaluate child constraints + ResetConstraints(); // Mark all constraints as unevaluated + DoPhase(1); // Just one phase need if no sizers involved + DoPhase(2); + SetConstraintSizes(); // Recursively set the real window sizes + return TRUE; } @@ -1018,17 +1046,15 @@ void wxWindowBase::SetConstraintSizes(bool recurse) int w = constr->width.GetValue(); int h = constr->height.GetValue(); - // If we don't want to resize this window, just move it... if ( (constr->width.GetRelationship() != wxAsIs ) || - (constr->height.GetRelationship() != wxAsIs)) + (constr->height.GetRelationship() != wxAsIs) ) { - // Calls Layout() recursively. AAAGH. How can we stop that. - // Simply take Layout() out of non-top level OnSizes. - SizerSetSize(x, y, w, h); + SetSize(x, y, w, h); } else { - SizerMove(x, y); + // If we don't want to resize this window, just move it... + Move(x, y); } } else if ( constr ) @@ -1036,18 +1062,18 @@ void wxWindowBase::SetConstraintSizes(bool recurse) wxChar *windowClass = GetClassInfo()->GetClassName(); wxString winName; - if ( GetName() == _T("") ) - winName = _T("unnamed"); + if ( GetName() == wxT("") ) + winName = wxT("unnamed"); else winName = GetName(); - wxLogDebug( _T("Constraint(s) not satisfied for window of type %s, name %s:\n"), + wxLogDebug( wxT("Constraint(s) not satisfied for window of type %s, name %s:\n"), (const wxChar *)windowClass, (const wxChar *)winName); - if ( !constr->left.GetDone()) wxLogDebug( _T(" unsatisfied 'left' constraint.\n") ); - if ( !constr->right.GetDone()) wxLogDebug( _T(" unsatisfied 'right' constraint.\n") ); - if ( !constr->width.GetDone()) wxLogDebug( _T(" unsatisfied 'width' constraint.\n") ); - if ( !constr->height.GetDone()) wxLogDebug( _T(" unsatisfied 'height' constraint.\n") ); - wxLogDebug( _T("Please check constraints: try adding AsIs() constraints.\n") ); + if ( !constr->left.GetDone()) wxLogDebug( wxT(" unsatisfied 'left' constraint.\n") ); + if ( !constr->right.GetDone()) wxLogDebug( wxT(" unsatisfied 'right' constraint.\n") ); + if ( !constr->width.GetDone()) wxLogDebug( wxT(" unsatisfied 'width' constraint.\n") ); + if ( !constr->height.GetDone()) wxLogDebug( wxT(" unsatisfied 'height' constraint.\n") ); + wxLogDebug( wxT("Please check constraints: try adding AsIs() constraints.\n") ); } if ( recurse ) @@ -1063,36 +1089,6 @@ void wxWindowBase::SetConstraintSizes(bool recurse) } } -// This assumes that all sizers are 'on' the same window, i.e. the parent of -// this window. -void wxWindowBase::TransformSizerToActual(int *x, int *y) const -{ - if ( !m_sizerParent || m_sizerParent->IsTopLevel() ) - return; - - int xp, yp; - m_sizerParent->GetPosition(&xp, &yp); - m_sizerParent->TransformSizerToActual(&xp, &yp); - *x += xp; - *y += yp; -} - -void wxWindowBase::SizerSetSize(int x, int y, int w, int h) -{ - int xx = x; - int yy = y; - TransformSizerToActual(&xx, &yy); - SetSize(xx, yy, w, h); -} - -void wxWindowBase::SizerMove(int x, int y) -{ - int xx = x; - int yy = y; - TransformSizerToActual(&xx, &yy); - Move(xx, yy); -} - // Only set the size/position of the constraint (if any) void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h) { @@ -1188,42 +1184,44 @@ void wxWindowBase::GetPositionConstraint(int *x, int *y) const // of control classes. void wxWindowBase::UpdateWindowUI() { - wxWindowID id = GetId(); - if ( id > 0 ) + wxUpdateUIEvent event(GetId()); + event.m_eventObject = this; + + if ( GetEventHandler()->ProcessEvent(event) ) { - wxUpdateUIEvent event(id); - event.m_eventObject = this; + if ( event.GetSetEnabled() ) + Enable(event.GetEnabled()); - if ( GetEventHandler()->ProcessEvent(event) ) + if ( event.GetSetText() ) { - if ( event.GetSetEnabled() ) - Enable(event.GetEnabled()); - - if ( event.GetSetText() ) + wxControl *control = wxDynamicCast(this, wxControl); + if ( control ) { - wxControl *control = wxDynamicCast(this, wxControl); - if ( control ) + wxTextCtrl *text = wxDynamicCast(control, wxTextCtrl); + if ( text ) + text->SetValue(event.GetText()); + else control->SetLabel(event.GetText()); } + } #if wxUSE_CHECKBOX - wxCheckBox *checkbox = wxDynamicCast(this, wxCheckBox); - if ( checkbox ) - { - if ( event.GetSetChecked() ) - checkbox->SetValue(event.GetChecked()); - } + wxCheckBox *checkbox = wxDynamicCast(this, wxCheckBox); + if ( checkbox ) + { + if ( event.GetSetChecked() ) + checkbox->SetValue(event.GetChecked()); + } #endif // wxUSE_CHECKBOX #if wxUSE_RADIOBUTTON - wxRadioButton *radiobtn = wxDynamicCast(this, wxRadioButton); - if ( radiobtn ) - { - if ( event.GetSetChecked() ) - radiobtn->SetValue(event.GetChecked()); - } -#endif // wxUSE_RADIOBUTTON + wxRadioButton *radiobtn = wxDynamicCast(this, wxRadioButton); + if ( radiobtn ) + { + if ( event.GetSetChecked() ) + radiobtn->SetValue(event.GetChecked()); } +#endif // wxUSE_RADIOBUTTON } } @@ -1264,7 +1262,7 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt) void wxWindowBase::DoSetClientObject( wxClientData *data ) { wxASSERT_MSG( m_clientDataType != ClientData_Void, - _T("can't have both object and void client data") ); + wxT("can't have both object and void client data") ); if ( m_clientObject ) delete m_clientObject; @@ -1276,7 +1274,7 @@ void wxWindowBase::DoSetClientObject( wxClientData *data ) wxClientData *wxWindowBase::DoGetClientObject() const { wxASSERT_MSG( m_clientDataType == ClientData_Object, - _T("this window doesn't have object client data") ); + wxT("this window doesn't have object client data") ); return m_clientObject; } @@ -1284,7 +1282,7 @@ wxClientData *wxWindowBase::DoGetClientObject() const void wxWindowBase::DoSetClientData( void *data ) { wxASSERT_MSG( m_clientDataType != ClientData_Object, - _T("can't have both object and void client data") ); + wxT("can't have both object and void client data") ); m_clientData = data; m_clientDataType = ClientData_Void; @@ -1293,7 +1291,7 @@ void wxWindowBase::DoSetClientData( void *data ) void *wxWindowBase::DoGetClientData() const { wxASSERT_MSG( m_clientDataType == ClientData_Void, - _T("this window doesn't have void client data") ); + wxT("this window doesn't have void client data") ); return m_clientData; }