reverted Julians changes to the pragmas

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

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index d528c697f9f4dc5ab6e8de99a96498627e590d24..f6226acfd4827bcf1e698a20f734dda2bf8fd443 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "checkbox.h"
 #endif
 
 #pragma implementation "checkbox.h"
 #endif
 

+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+

 #include "wx/checkbox.h"
 #include "wx/utils.h"
 
 #include "wx/checkbox.h"
 #include "wx/utils.h"
 


@@ -32,10 +36,8 @@
 void wxCheckBoxCallback (Widget w, XtPointer clientData,
                          XtPointer ptr);
 
 void wxCheckBoxCallback (Widget w, XtPointer clientData,
                          XtPointer ptr);
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)

-#endif

 
 // Single check box item
 bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
 // Single check box item
 bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,


@@ -62,8 +64,9 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
     XmString text = XmStringCreateSimple (label1);
 #endif
     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
     XmString text = XmStringCreateSimple (label1);
 #endif

+    wxString label1(wxStripMenuCodes(label));

 
 

-    wxXmString text( label );
+    wxXmString text( label1 );

     
     Widget parentWidget = (Widget) parent->GetClientWidget();
     XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
     
     Widget parentWidget = (Widget) parent->GetClientWidget();
     XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));