X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/338dd992160bf20205743c092b353d96ef7604fb..5c3e299e08be35d0f88e6e86c8cee97f07ced3ca:/src/motif/control.cpp?ds=inline diff --git a/src/motif/control.cpp b/src/motif/control.cpp index d93439940d..c31dec797f 100644 --- a/src/motif/control.cpp +++ b/src/motif/control.cpp @@ -25,12 +25,10 @@ #pragma message enable nosimpint #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) BEGIN_EVENT_TABLE(wxControl, wxWindow) END_EVENT_TABLE() -#endif // Item members wxControl::wxControl() @@ -45,6 +43,23 @@ wxControl::wxControl() m_inSetValue = FALSE; } +bool wxControl::Create( wxWindow *parent, + wxWindowID id, + const wxPoint &pos, + const wxSize &size, + long style, + const wxValidator& validator, + const wxString &name) +{ + bool ret = wxWindow::Create(parent, id, pos, size, style, name); + +#if wxUSE_VALIDATORS + SetValidator(validator); +#endif + + return ret; +} + wxControl::~wxControl() { // If we delete an item, we should initialize the parent panel, @@ -52,7 +67,7 @@ wxControl::~wxControl() wxPanel *panel = wxDynamicCast(GetParent(), wxPanel); if (panel) { - if (panel->GetDefaultItem() == this) + if ( (wxControl *)panel->GetDefaultItem() == this) panel->SetDefaultItem((wxButton*) NULL); } }