X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31528cd3cac75558beef4bce0ba21fd182a808ab..bb16e81453a02433f2a313037b1c9b62681b45b8:/src/motif/checkbox.cpp

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 4b582b16c7..613052ef21 100644
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -13,23 +13,33 @@
 #pragma implementation "checkbox.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
+#include "wx/defs.h"
+
 #include "wx/checkbox.h"
 #include "wx/utils.h"
 
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 #include <Xm/ToggleB.h>
 #include <Xm/ToggleBG.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
 #include "wx/motif/private.h"
 
 void wxCheckBoxCallback (Widget w, XtPointer clientData,
                          XtPointer ptr);
 
-#if !USE_SHARED_LIBRARY
 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,
@@ -52,19 +62,26 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     else
         m_windowId = id;
 
+#if 0  // gcc 2.95 doesn't like this apparently    
     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
-
     XmString text = XmStringCreateSimple (label1);
+#endif
+    wxString label1(wxStripMenuCodes(label));
+
+    wxXmString text( label1 );
+    
     Widget parentWidget = (Widget) parent->GetClientWidget();
     XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
         xmToggleButtonWidgetClass, parentWidget,
         XmNfontList, fontList,
-        XmNlabelString, text,
+        XmNlabelString, text(),
         NULL);
+#if 0    
     XmStringFree (text);
-
+#endif
+    
     XtAddCallback ((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc) wxCheckBoxCallback,
         (XtPointer) this);
 
@@ -96,9 +113,9 @@ void wxCheckBox::Command (wxCommandEvent & event)
 }
 
 // Bitmap checkbox
-bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label,
-                              const wxPoint& pos,
-                              const wxSize& size, long style,
+bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *WXUNUSED(label),
+                              const wxPoint& WXUNUSED(pos),
+                              const wxSize& WXUNUSED(size), long style,
                               const wxValidator& validator,
                               const wxString& name)
 {
@@ -118,17 +135,17 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
     return FALSE;
 }
 
-void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
+void wxBitmapCheckBox::SetLabel(const wxBitmap& WXUNUSED(bitmap))
 {
     // TODO
 }
 
-void wxBitmapCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+void wxBitmapCheckBox::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(sizeFlags))
 {
     // TODO
 }
 
-void wxBitmapCheckBox::SetValue(bool val)
+void wxBitmapCheckBox::SetValue(bool WXUNUSED(val))
 {
     // TODO
 }
@@ -139,8 +156,8 @@ bool wxBitmapCheckBox::GetValue() const
     return FALSE;
 }
 
-void wxCheckBoxCallback (Widget w, XtPointer clientData,
-                         XtPointer ptr)
+void wxCheckBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
+                         XtPointer WXUNUSED(ptr))
 {
     wxCheckBox *item = (wxCheckBox *) clientData;