wxControl child of wxControlBase

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index a1928d0a09c9b40a52a00f8d1386a4d8182ac1eb..e6f8a9acca7fe7495e236b203f4ac6b5ef8b180e 100644 (file)
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -23,7 +23,7 @@
 #define wxControlNameStr _T("control")
 
 // General item class
 #define wxControlNameStr _T("control")
 
 // General item class

-class WXDLLEXPORT wxControl: public wxWindow
+class WXDLLEXPORT wxControl: public wxControlBase

 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 


@@ -35,7 +35,16 @@ public:
                const wxSize &size = wxDefaultSize,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                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();
 
 
     ~wxControl();
 

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 4eb2e47f0a93be3476abfc5505d4237140d00847..4a799084775bd04c81c70ff4d58db1646af3c710 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -43,7 +43,7 @@ wxControl::wxControl()
     m_inSetValue = FALSE;
 }
 
     m_inSetValue = FALSE;
 }
 

-wxControl::wxControl( wxWindow *parent,
+bool wxControl::Create( wxWindow *parent,

                       wxWindowID id,
                       const wxPoint &pos,
                       const wxSize &size,
                       wxWindowID id,
                       const wxPoint &pos,
                       const wxSize &size,


@@ -51,11 +51,13 @@ wxControl::wxControl( wxWindow *parent,
                       const wxValidator& validator,
                       const wxString &name)
 {
                       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
 
 #if wxUSE_VALIDATORS
     SetValidator(validator);
 #endif

+
+    return ret;

 }
 
 wxControl::~wxControl()
 }
 
 wxControl::~wxControl()