added carbonaccessors.o

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 94f43a746bb0e7f74f4752b2594de2636a54f243..894198a0a10515ecf166c0a6b40a5724ebbc5832 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -13,6 +13,8 @@
 #pragma implementation "control.h"
 #endif
 
 #pragma implementation "control.h"
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/control.h"
 #include "wx/panel.h"
 #include "wx/utils.h"
 #include "wx/control.h"
 #include "wx/panel.h"
 #include "wx/utils.h"


@@ -43,18 +45,7 @@ wxControl::wxControl()
     m_inSetValue = FALSE;
 }
 
     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,
                       wxWindowID id,
                       const wxPoint &pos,
                       const wxSize &size,


@@ -62,21 +53,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);
     SetValidator(validator);

-}

 #endif
 
 #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)
 }
 
 void wxControl::SetLabel(const wxString& label)