X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef397583dfdf7ba59ecb0a72659c455f04523c97..1facd32a75f3ef190a336e96fabf17632ade7228:/src/common/wincmn.cpp diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 95c51f5899..4c5ebcc5da 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -35,6 +35,7 @@ #include "wx/frame.h" #include "wx/defs.h" #include "wx/window.h" + #include "wx/control.h" #include "wx/checkbox.h" #include "wx/radiobut.h" #include "wx/textctrl.h" @@ -116,7 +117,7 @@ void wxWindowBase::InitBase() // no client data (yet) m_clientData = NULL; - m_clientDataType = ClientData_None; + m_clientDataType = wxClientData_None; // the default event handler is just this window m_eventHandler = this; @@ -225,16 +226,6 @@ wxWindowBase::~wxWindowBase() 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); - if ( panel ) - { - if ( panel->GetLastFocus() == this ) - { - panel->SetLastFocus((wxWindow *)NULL); - } - } - #if wxUSE_CARET if ( m_caret ) delete m_caret; @@ -246,7 +237,7 @@ wxWindowBase::~wxWindowBase() #endif // wxUSE_VALIDATORS // we only delete object data, not untyped - if ( m_clientDataType == ClientData_Object ) + if ( m_clientDataType == wxClientData_Object ) delete m_clientObject; #if wxUSE_CONSTRAINTS @@ -314,6 +305,7 @@ bool wxWindowBase::DestroyChildren() wxASSERT_MSG( child, wxT("children list contains empty nodes") ); + child->Show(FALSE); delete child; wxASSERT_MSG( !GetChildren().Find(child), @@ -455,7 +447,11 @@ wxSize wxWindowBase::DoGetBestSize() const node = node->GetNext() ) { wxWindow *win = node->GetData(); - if ( win->IsTopLevel() || wxDynamicCast(win, wxStatusBar) || !win->IsShown()) + if ( win->IsTopLevel() +#if wxUSE_STATUSBAR + || wxDynamicCast(win, wxStatusBar) +#endif // wxUSE_STATUSBAR + ) { // dialogs and frames lie in different top level windows - // don't deal with them here; as for the status bars, they @@ -490,6 +486,12 @@ wxSize wxWindowBase::DoGetBestSize() const } } +// by default the origin is not shifted +wxPoint wxWindowBase::GetClientAreaOrigin() const +{ + return wxPoint(0, 0); +} + // set the min/max size of the window void wxWindowBase::SetSizeHints(int minW, int minH, int maxW, int maxH, @@ -717,9 +719,21 @@ void wxWindowBase::SetValidator(const wxValidator& validator) #endif // wxUSE_VALIDATORS // ---------------------------------------------------------------------------- -// update region testing +// update region stuff // ---------------------------------------------------------------------------- +wxRect wxWindowBase::GetUpdateClientRect() const +{ + wxRegion rgnUpdate = GetUpdateRegion(); + rgnUpdate.Intersect(GetClientRect()); + wxRect rectUpdate = rgnUpdate.GetBox(); + wxPoint ptOrigin = GetClientAreaOrigin(); + rectUpdate.x -= ptOrigin.x; + rectUpdate.y -= ptOrigin.y; + + return rectUpdate; +} + bool wxWindowBase::IsExposed(int x, int y) const { return m_updateRegion.Contains(x, y) != wxOutRegion; @@ -1359,6 +1373,7 @@ void wxWindowBase::GetPositionConstraint(int *x, int *y) const // of control classes. void wxWindowBase::UpdateWindowUI() { +#if wxUSE_CONTROLS wxUpdateUIEvent event(GetId()); event.m_eventObject = this; @@ -1369,19 +1384,21 @@ void wxWindowBase::UpdateWindowUI() if ( event.GetSetText() ) { - wxControl *control = wxDynamicThisCast(this, wxControl); + wxControl *control = wxDynamicCastThis(wxControl); if ( control ) { +#if wxUSE_TEXTCTRL wxTextCtrl *text = wxDynamicCast(control, wxTextCtrl); if ( text ) text->SetValue(event.GetText()); else +#endif // wxUSE_TEXTCTRL control->SetLabel(event.GetText()); } } #if wxUSE_CHECKBOX - wxCheckBox *checkbox = wxDynamicThisCast(this, wxCheckBox); + wxCheckBox *checkbox = wxDynamicCastThis(wxCheckBox); if ( checkbox ) { if ( event.GetSetChecked() ) @@ -1390,7 +1407,7 @@ void wxWindowBase::UpdateWindowUI() #endif // wxUSE_CHECKBOX #if wxUSE_RADIOBTN - wxRadioButton *radiobtn = wxDynamicThisCast(this, wxRadioButton); + wxRadioButton *radiobtn = wxDynamicCastThis(wxRadioButton); if ( radiobtn ) { if ( event.GetSetChecked() ) @@ -1398,6 +1415,7 @@ void wxWindowBase::UpdateWindowUI() } #endif // wxUSE_RADIOBTN } +#endif // wxUSE_CONTROLS } // ---------------------------------------------------------------------------- @@ -1436,21 +1454,21 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt) void wxWindowBase::DoSetClientObject( wxClientData *data ) { - wxASSERT_MSG( m_clientDataType != ClientData_Void, + wxASSERT_MSG( m_clientDataType != wxClientData_Void, wxT("can't have both object and void client data") ); if ( m_clientObject ) delete m_clientObject; m_clientObject = data; - m_clientDataType = ClientData_Object; + m_clientDataType = wxClientData_Object; } wxClientData *wxWindowBase::DoGetClientObject() const { // it's not an error to call GetClientObject() on a window which doesn't // have client data at all - NULL will be returned - wxASSERT_MSG( m_clientDataType != ClientData_Void, + wxASSERT_MSG( m_clientDataType != wxClientData_Void, wxT("this window doesn't have object client data") ); return m_clientObject; @@ -1458,18 +1476,18 @@ wxClientData *wxWindowBase::DoGetClientObject() const void wxWindowBase::DoSetClientData( void *data ) { - wxASSERT_MSG( m_clientDataType != ClientData_Object, + wxASSERT_MSG( m_clientDataType != wxClientData_Object, wxT("can't have both object and void client data") ); m_clientData = data; - m_clientDataType = ClientData_Void; + m_clientDataType = wxClientData_Void; } void *wxWindowBase::DoGetClientData() const { // it's not an error to call GetClientData() on a window which doesn't have // client data at all - NULL will be returned - wxASSERT_MSG( m_clientDataType != ClientData_Object, + wxASSERT_MSG( m_clientDataType != wxClientData_Object, wxT("this window doesn't have void client data") ); return m_clientData; @@ -1507,6 +1525,7 @@ void wxWindowBase::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) ) // process Ctrl-Alt-mclick void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) { +#if wxUSE_MSGDLG if ( event.ControlDown() && event.AltDown() ) { // don't translate these strings @@ -1551,6 +1570,7 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) (wxWindow *)this); } else +#endif // wxUSE_MSGDLG { event.Skip(); } @@ -1565,3 +1585,43 @@ void wxWindowListNode::DeleteData() delete (wxWindow *)GetData(); } +// ---------------------------------------------------------------------------- +// borders +// ---------------------------------------------------------------------------- + +wxBorder wxWindowBase::GetBorder() const +{ + wxBorder border = (wxBorder)(m_windowStyle & wxBORDER_MASK); + if ( border == wxBORDER_DEFAULT ) + { + border = GetDefaultBorder(); + } + + return border; +} + +wxBorder wxWindowBase::GetDefaultBorder() const +{ + return wxBORDER_NONE; +} + +// ---------------------------------------------------------------------------- +// hit testing +// ---------------------------------------------------------------------------- + +wxHitTest wxWindowBase::DoHitTest(wxCoord x, wxCoord y) const +{ + // here we just check if the point is inside the window or not + + // check the top and left border first + bool outside = x < 0 || y < 0; + if ( !outside ) + { + // check the right and bottom borders too + wxSize size = GetSize(); + outside = x >= size.x || y >= size.y; + } + + return outside ? wxHT_WINDOW_OUTSIDE : wxHT_WINDOW_INSIDE; +} +