fixed array tests compilation and a bug in obj array test

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index d93439940da41718d51b752bede556a45dfa03e9..1dc7e344c54a1c0ae1ceab45959b157b2a50708a 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"


@@ -25,12 +27,12 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

-#if !USE_SHARED_LIBRARY
+#include "wx/motif/private.h"
+

 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
 END_EVENT_TABLE()
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
 END_EVENT_TABLE()

-#endif

 
 // Item members
 wxControl::wxControl()
 
 // Item members
 wxControl::wxControl()


@@ -45,16 +47,21 @@ wxControl::wxControl()
     m_inSetValue = FALSE;
 }
 
     m_inSetValue = FALSE;
 }
 

-wxControl::~wxControl()
+bool wxControl::Create( wxWindow *parent,
+                      wxWindowID id,
+                      const wxPoint &pos,
+                      const wxSize &size,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString &name)

 {
 {

-    // 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);
-    }
+    bool ret = wxWindow::Create(parent, id, pos, size, style, name);
+
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif
+
+    return ret;

 }
 
 void wxControl::SetLabel(const wxString& label)
 }
 
 void wxControl::SetLabel(const wxString& label)


@@ -63,14 +70,13 @@ void wxControl::SetLabel(const wxString& label)
     if (!widget)
         return;
 
     if (!widget)
         return;
 

-    wxStripMenuCodes((char*) (const char*) label, wxBuffer);
+    wxString buf(wxStripMenuCodes(label));
+    wxXmString label_str(buf);

 
 

-    XmString text = XmStringCreateSimple (wxBuffer);

     XtVaSetValues (widget,
     XtVaSetValues (widget,

-        XmNlabelString, text,
+        XmNlabelString, label_str(),

         XmNlabelType, XmSTRING,
         NULL);
         XmNlabelType, XmSTRING,
         NULL);

-    XmStringFree (text);

 }
 
 wxString wxControl::GetLabel() const
 }
 
 wxString wxControl::GetLabel() const