X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/674ac8b919eecbc201b5f23b470a567cd0565e10..d9ff0f91fbddae88286567cab74dcfb59c91fc0f:/src/motif/control.cpp diff --git a/src/motif/control.cpp b/src/motif/control.cpp index 4eb2e47f0a..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,7 +45,7 @@ wxControl::wxControl() m_inSetValue = FALSE; } -wxControl::wxControl( wxWindow *parent, +bool wxControl::Create( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, @@ -51,11 +53,13 @@ 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() @@ -65,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); } }