projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed array tests compilation and a bug in obj array test
[wxWidgets.git]
/
src
/
motif
/
radiobut.cpp
diff --git
a/src/motif/radiobut.cpp
b/src/motif/radiobut.cpp
index 4c7e3c755e65a36ec1e063452ad29eabac7e4d88..9d77c21388a01c6b2de3990fcab1f57c2c86b104 100644
(file)
--- a/
src/motif/radiobut.cpp
+++ b/
src/motif/radiobut.cpp
@@
-13,6
+13,12
@@
#pragma implementation "radiobut.h"
#endif
#pragma implementation "radiobut.h"
#endif
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
+#include "wx/defs.h"
+
#include "wx/radiobut.h"
#include "wx/utils.h"
#include "wx/radiobut.h"
#include "wx/utils.h"
@@
-34,9
+40,7
@@
void wxRadioButtonCallback (Widget w, XtPointer clientData,
XmToggleButtonCallbackStruct * cbs);
void wxRadioButtonCallback (Widget w, XtPointer clientData,
XmToggleButtonCallbackStruct * cbs);
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-#endif
wxRadioButton::wxRadioButton()
{
wxRadioButton::wxRadioButton()
{
@@
-85,17
+89,8
@@
bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
NULL);
XmStringFree (text);
NULL);
XmStringFree (text);
-#ifdef __VMS__
-#pragma message disable voiincconext
- // VMS gives here the compiler warning:
- // conversion from pointer to function to void* permitted
- // as an extension
-#endif
XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
- (XtCallbackProc) this);
-#ifdef __VMS__
-#pragma message enable voiincconext
-#endif
+ (XtPointer) this);
m_mainWidget = (WXWidget) radioButtonWidget;
m_mainWidget = (WXWidget) radioButtonWidget;