More updates to the Debian packaging for wxPython, unicode and

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index a5a8fc3bfa9f1cb85020b73699972550409d2ef3..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,7 +99,7 @@ wxString wxControl::GetLabel() const
     if (!widget)
         return wxEmptyString;
 
-    XmString text;
+    XmString text = NULL;
     XtVaGetValues (widget,
         XmNlabelString, &text,
         NULL);
@@ -114,15 +109,5 @@ wxString wxControl::GetLabel() const
 
 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);
 }