projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed incorrect param from docs
[wxWidgets.git]
/
src
/
motif
/
checkbox.cpp
diff --git
a/src/motif/checkbox.cpp
b/src/motif/checkbox.cpp
index 0f90243a26e60e1c65703482f84a6448f0d4557b..f6226acfd4827bcf1e698a20f734dda2bf8fd443 100644
(file)
--- a/
src/motif/checkbox.cpp
+++ b/
src/motif/checkbox.cpp
@@
-13,23
+13,31
@@
#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"
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#include <Xm/ToggleB.h>
#include <Xm/ToggleBG.h>
#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);
#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)
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,
@@
-56,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( label
1
);
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));