X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8680e3e0e5066d35a8f4fd43294ba4bfcaf4ba7..d13b34d3f2be575d59747a5926000be7b28a45dc:/src/motif/slider.cpp

diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp
index 69d6efb92c..70c5c66a24 100644
--- a/src/motif/slider.cpp
+++ b/src/motif/slider.cpp
@@ -1,20 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        slider.cpp
+// Name:        src/motif/slider.cpp
 // Purpose:     wxSlider
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "slider.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_SLIDER
 
 #include "wx/slider.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -30,9 +34,7 @@
 
 #include "wx/motif/private.h"
 
-void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs);
-
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
+static void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs);
 
 BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()
@@ -60,6 +62,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;
+    PreCreation();
 
     m_lineSize = 1;
     m_windowStyle = style;
@@ -86,29 +89,13 @@ 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);
+    PostCreation();
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
-    ChangeBackgroundColour();
-
-    return TRUE;
+    return true;
 }
 
 wxSlider::~wxSlider()
@@ -228,14 +215,17 @@ 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);
+    slider->HandleWindowEvent(event);
 
     // Also send a wxCommandEvent for compatibility.
     wxCommandEvent event2(wxEVT_COMMAND_SLIDER_UPDATED, slider->GetId());
     event2.SetEventObject(slider);
     event2.SetInt( event.GetInt() );
-    slider->GetEventHandler()->ProcessEvent(event2);
+    slider->HandleWindowEvent(event2);
 }
 
+#endif // wxUSE_SLIDER