Commit mentioned fix/hack to enable controls

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index af57174fe6e3a7d404ee4107ce91ae7a564e8d71..e6d45853c9b0f832f4b3456cd7fb0a30aea52207 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "control.h"
 #endif
 
@@ -40,10 +40,6 @@ wxControl::wxControl()
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
 
-#if WXWIN_COMPATIBILITY
-    m_callback = 0;
-#endif // WXWIN_COMPATIBILITY
-
     m_inSetValue = FALSE;
 }
 
@@ -89,8 +85,7 @@ void wxControl::SetLabel(const wxString& label)
     if (!widget)
         return;
 
-    wxString buf(wxStripMenuCodes(label));
-    wxXmString label_str(buf);
+    wxXmString label_str(wxStripMenuCodes(label));
 
     XtVaSetValues (widget,
         XmNlabelString, label_str(),
@@ -104,37 +99,15 @@ wxString wxControl::GetLabel() const
     if (!widget)
         return wxEmptyString;
 
-    XmString text;
-    char *s;
+    XmString text = NULL;
     XtVaGetValues (widget,
         XmNlabelString, &text,
         NULL);
 
-    if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
-    {
-        wxString str(s);
-        XtFree (s);
-        XmStringFree(text);
-        return str;
-    }
-    else
-    {
-      //        XmStringFree(text);
-        return wxEmptyString;
-    }
+    return wxXmStringToString( text );
 }
 
 bool wxControl::ProcessCommand(wxCommandEvent & event)
 {
-#if WXWIN_COMPATIBILITY
-    if ( m_callback )
-    {
-        (void)(*m_callback)(this, event);
-
-        return TRUE;
-    }
-    else
-#endif // WXWIN_COMPATIBILITY
-
     return GetEventHandler()->ProcessEvent(event);
 }