projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix compilation without WXDEBUG (includes patch 561458)
[wxWidgets.git]
/
src
/
motif
/
radiobox.cpp
diff --git
a/src/motif/radiobox.cpp
b/src/motif/radiobox.cpp
index 33b1ab2f25ae587d95466493b7c5119b77efc806..82baee26db9e7a8d547c7c92dcb8f1c2eddf12cd 100644
(file)
--- a/
src/motif/radiobox.cpp
+++ b/
src/motif/radiobox.cpp
@@
-13,9
+13,18
@@
#pragma implementation "radiobox.h"
#endif
#pragma implementation "radiobox.h"
#endif
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
+#include "wx/defs.h"
+
#include "wx/radiobox.h"
#include "wx/utils.h"
#include "wx/radiobox.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/Label.h>
#include <Xm/LabelG.h>
#include <Xm/ToggleB.h>
@@
-23,15
+32,16
@@
#include <Xm/RowColumn.h>
#include <Xm/Form.h>
#include <Xm/Frame.h>
#include <Xm/RowColumn.h>
#include <Xm/Form.h>
#include <Xm/Frame.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
#include "wx/motif/private.h"
void wxRadioBoxCallback (Widget w, XtPointer clientData,
XmToggleButtonCallbackStruct * cbs);
#include "wx/motif/private.h"
void wxRadioBoxCallback (Widget w, XtPointer clientData,
XmToggleButtonCallbackStruct * cbs);
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
-#endif
// Radio box item
wxRadioBox::wxRadioBox()
// Radio box item
wxRadioBox::wxRadioBox()
@@
-168,8
+178,7
@@
bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
XmNfontList, fontList,
NULL);
XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback,
XmNfontList, fontList,
NULL);
XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback,
- (XtCallbackProc) this);
-
+ (XtPointer) this);
}
SetSelection (0);
}
SetSelection (0);
@@
-477,7
+486,7
@@
void wxRadioBoxCallback (Widget w, XtPointer clientData,
wxRadioBox *item = (wxRadioBox *) clientData;
int sel = -1;
int i;
wxRadioBox *item = (wxRadioBox *) clientData;
int sel = -1;
int i;
- for (i = 0; i < item->
Number
(); i++)
+ for (i = 0; i < item->
GetCount
(); i++)
if (item->GetRadioButtons() && ((Widget) (item->GetRadioButtons()[i]) == w))
sel = i;
item->SetSel(sel);
if (item->GetRadioButtons() && ((Widget) (item->GetRadioButtons()[i]) == w))
sel = i;
item->SetSel(sel);