X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/312ebad4cd1fad97a79aaed7102611df88806410..44aa865dfc8884ee42fc2d7033bb6ed443b59c57:/src/motif/slider.cpp

diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp
index fdd2ff7358..d82e67f19c 100644
--- a/src/motif/slider.cpp
+++ b/src/motif/slider.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "slider.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -37,7 +33,7 @@
 
 #include "wx/motif/private.h"
 
-void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs);
+static void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs);
 
 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 
@@ -93,21 +89,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     m_mainWidget = (WXWidget) sliderWidget;
 
-#ifdef __VMS__
-#pragma message disable codcauunr
-   // VMS gives here the compiler warning :
-   // statement either is unreachable or causes unreachable code
-#endif
-    if(style & wxSL_NOTIFY_DRAG)
-        XtAddCallback (sliderWidget, XmNdragCallback,
-        (XtCallbackProc) wxSliderCallback, (XtPointer) this);
-    else
-        XtAddCallback (sliderWidget, XmNvalueChangedCallback,
-        (XtCallbackProc) wxSliderCallback, (XtPointer) this);
-#ifdef __VMS__
-#pragma message enable codcauunr
-#endif
-
+    XtAddCallback (sliderWidget, XmNvalueChangedCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);
     XtAddCallback (sliderWidget, XmNdragCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);
 
     ChangeFont(false);
@@ -235,7 +217,9 @@ void wxSliderCallback (Widget widget, XtPointer clientData,
     }
 
     wxScrollEvent event(scrollEvent, slider->GetId());
-    XtVaGetValues (widget, XmNvalue, &event.m_commandInt, NULL);
+    int commandInt = event.GetInt();
+    XtVaGetValues (widget, XmNvalue, &commandInt, NULL);
+    event.SetInt(commandInt);
     event.SetEventObject(slider);
     slider->GetEventHandler()->ProcessEvent(event);