no significant changes

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 310c2c686195d0a412b4bc313d413d7f2e302c41..1dc7e344c54a1c0ae1ceab45959b157b2a50708a 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -27,6 +27,8 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

+#include "wx/motif/private.h"
+

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


@@ -62,32 +64,19 @@ bool wxControl::Create( wxWindow *parent,
     return ret;
 }
 
     return ret;
 }
 

-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 ( (wxControl *)panel->GetDefaultItem() == this)
-            panel->SetDefaultItem((wxButton*) NULL);
-    }
-}
-

 void wxControl::SetLabel(const wxString& label)
 {
     Widget widget = (Widget) GetLabelWidget() ;
     if (!widget)
         return;
 
 void wxControl::SetLabel(const wxString& label)
 {
     Widget widget = (Widget) GetLabelWidget() ;
     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