Updated to new PyCrust

[wxWidgets.git] / src / motif / control.cpp

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 4eb2e47f0a93be3476abfc5505d4237140d00847..894198a0a10515ecf166c0a6b40a5724ebbc5832 100644 (file)
--- 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,23 +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
-}
 
-wxControl::~wxControl()
-{
-    // If we delete an item, we should initialize the parent panel,
-    // because it could now be invalid.
-    wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
-    if (panel)
-    {
-        if (panel->GetDefaultItem() == this)
-            panel->SetDefaultItem((wxButton*) NULL);
-    }
+    return ret;
 }
 
 void wxControl::SetLabel(const wxString& label)