wxRegion fixes (off by one)

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

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index 2cd62c7578f5d9632198803b9cf79af1f3a8a1ac..82baee26db9e7a8d547c7c92dcb8f1c2eddf12cd 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -13,6 +13,12 @@
 #pragma implementation "radiobox.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
+#include "wx/defs.h"
+
 #include "wx/radiobox.h"
 #include "wx/utils.h"
 
@@ -35,9 +41,7 @@
 void wxRadioBoxCallback (Widget w, XtPointer clientData,
                     XmToggleButtonCallbackStruct * cbs);
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
-#endif
 
 // Radio box item
 wxRadioBox::wxRadioBox()
@@ -173,18 +177,8 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 #endif
                                     XmNfontList, fontList,
                                                  NULL);
-#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 ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback,
-                     (XtCallbackProc) this);
-#ifdef __VMS__
-#pragma message enable voiincconext
-#endif
-
+                     (XtPointer) this);
     }
     SetSelection (0);
 
@@ -492,7 +486,7 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData,
   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);