renamed scrolwin file - no other way to make wxGTK/Univ compile

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

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index 2cd62c7578f5d9632198803b9cf79af1f3a8a1ac..6d4d088da2612c83cc5c8984234fa254568f1dd7 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "radiobox.h"
 #endif
 
 #pragma implementation "radiobox.h"
 #endif
 

+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+

 #include "wx/radiobox.h"
 #include "wx/utils.h"
 
 #include "wx/radiobox.h"
 #include "wx/utils.h"
 


@@ -35,9 +39,7 @@
 void wxRadioBoxCallback (Widget w, XtPointer clientData,
                     XmToggleButtonCallbackStruct * cbs);
 
 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()


@@ -173,18 +175,8 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 #endif
                                     XmNfontList, fontList,
                                                  NULL);
 #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,
         XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback,

-                     (XtCallbackProc) this);
-#ifdef __VMS__
-#pragma message enable voiincconext
-#endif
-
+                     (XtPointer) this);

     }
     SetSelection (0);
 
     }
     SetSelection (0);