From 5a2155efdb30931a19c2686511887966feb0c470 Mon Sep 17 00:00:00 2001 From: "Bart A.M. Jourquin" Date: Fri, 7 Jan 2000 14:59:14 +0000 Subject: [PATCH] wxControl child of wxControlBase git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/motif/control.h | 13 +++++++++++-- src/motif/control.cpp | 6 ++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h index a1928d0a09..e6f8a9acca 100644 --- a/include/wx/motif/control.h +++ b/include/wx/motif/control.h @@ -23,7 +23,7 @@ #define wxControlNameStr _T("control") // General item class -class WXDLLEXPORT wxControl: public wxWindow +class WXDLLEXPORT wxControl: public wxControlBase { DECLARE_ABSTRACT_CLASS(wxControl) @@ -35,7 +35,16 @@ public: const wxSize &size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxControlNameStr ); + const wxString &name = wxControlNameStr ) + { + Create(parent, id, pos, size, style, validator, name); + } + + bool Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxControlNameStr); ~wxControl(); diff --git a/src/motif/control.cpp b/src/motif/control.cpp index 4eb2e47f0a..4a79908477 100644 --- a/src/motif/control.cpp +++ b/src/motif/control.cpp @@ -43,7 +43,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 +51,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() -- 2.45.2