implemented 'shaft scrolling' of children in wxUnivWindow::ScrollWindow

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 6413b921032581ae73b298930b3361a8414707db..1dc7e344c54a1c0ae1ceab45959b157b2a50708a 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -27,6 +27,8 @@
 #pragma message enable nosimpint
 #endif
 
+#include "wx/motif/private.h"
+
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
@@ -62,28 +64,19 @@ bool wxControl::Create( wxWindow *parent,
     return ret;
 }
 
-wxControl::~wxControl()
-{
-    // If we delete an item, we should initialize the parent panel,
-    // because it could now be invalid.
-    if ( GetParent()->panel->GetDefaultItem() == this)
-        panel->SetDefaultItem(NULL);
-}
-
 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,
-        XmNlabelString, text,
+        XmNlabelString, label_str(),
         XmNlabelType, XmSTRING,
         NULL);
-    XmStringFree (text);
 }
 
 wxString wxControl::GetLabel() const