missing commit

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

diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp
index 31ca0ae3e0cd51ed74821462a99ad87368c33064..478b1d686ddcaf3b312411ec087785b5c0dcdb83 100644 (file)
--- a/src/motif/slider.cpp
+++ b/src/motif/slider.cpp
@@ -15,7 +15,10 @@
 #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
@@ -33,8 +36,6 @@
 
 static void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs);
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-
 BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()
 
@@ -61,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;
@@ -90,11 +92,9 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     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;
 }
 
@@ -219,13 +219,13 @@ void wxSliderCallback (Widget widget, XtPointer clientData,
     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());
+    wxCommandEvent event2(wxEVT_SLIDER, slider->GetId());
     event2.SetEventObject(slider);
     event2.SetInt( event.GetInt() );
-    slider->GetEventHandler()->ProcessEvent(event2);
+    slider->HandleWindowEvent(event2);
 }
 
 #endif // wxUSE_SLIDER