X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0148fe1e2a2ea076bcd7a647c0b7946de0e0f990..d9ff0f91fbddae88286567cab74dcfb59c91fc0f:/src/motif/control.cpp diff --git a/src/motif/control.cpp b/src/motif/control.cpp index 94f43a746b..310c2c6861 100644 --- a/src/motif/control.cpp +++ b/src/motif/control.cpp @@ -13,6 +13,8 @@ #pragma implementation "control.h" #endif +#include "wx/defs.h" + #include "wx/control.h" #include "wx/panel.h" #include "wx/utils.h" @@ -43,18 +45,7 @@ wxControl::wxControl() m_inSetValue = FALSE; } -wxControl::wxControl( wxWindow *parent, - wxWindowID id, - const wxPoint &pos, - const wxSize &size, - long style, - const wxString &name ) -{ - (void)Create(parent, id, pos, size, style, name); -} - -#if wxUSE_VALIDATORS -wxControl::wxControl( wxWindow *parent, +bool wxControl::Create( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, @@ -62,11 +53,15 @@ wxControl::wxControl( wxWindow *parent, const wxValidator& validator, const wxString &name) { - (void)Create(parent, id, pos, size, style, 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, @@ -74,7 +69,7 @@ wxControl::~wxControl() wxPanel *panel = wxDynamicCast(GetParent(), wxPanel); if (panel) { - if (panel->GetDefaultItem() == this) + if ( (wxControl *)panel->GetDefaultItem() == this) panel->SetDefaultItem((wxButton*) NULL); } }