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

diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp
index 3fa3e0bfc1..8e52931335 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,7 +34,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)
 
@@ -46,7 +50,6 @@ wxSlider::wxSlider()
     m_lineSize = 1;
     m_rangeMax = 0;
     m_rangeMin = 0;
-    m_tickFreq = 0;
 }
 
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
@@ -55,25 +58,15 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
                       const wxSize& size, long style,
                       const wxValidator& validator,
                       const wxString& name)
-{    
+{
     if ( !((style & wxSL_HORIZONTAL) || (style & wxSL_VERTICAL)) )
          style |= wxSL_HORIZONTAL;
-    
-    SetName(name);
-    SetValidator(validator);
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
 
-    if (parent) parent->AddChild(this);
+    if( !CreateControl( parent, id, pos, size, style, validator, name ) )
+        return false;
 
     m_lineSize = 1;
     m_windowStyle = style;
-    m_tickFreq = 0;
-
-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
 
     m_rangeMax = maxValue;
     m_rangeMin = minValue;
@@ -97,32 +90,15 @@ 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);
 
-    m_font = parent->GetFont();
-
-    ChangeFont(FALSE);
-    SetCanAddEventHandler(TRUE);
+    ChangeFont(false);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     ChangeBackgroundColour();
 
-    return TRUE;
+    return true;
 }
 
 wxSlider::~wxSlider()
@@ -141,11 +117,6 @@ void wxSlider::SetValue(int value)
     XtVaSetValues ((Widget) m_mainWidget, XmNvalue, value, NULL);
 }
 
-void wxSlider::GetSize(int *width, int *height) const
-{
-    wxControl::GetSize(width, height);
-}
-
 void wxSlider::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     Widget widget = (Widget) m_mainWidget;
@@ -186,12 +157,6 @@ void wxSlider::SetRange(int minValue, int maxValue)
 }
 
 // For trackbars only
-void wxSlider::SetTickFreq(int n, int WXUNUSED(pos))
-{
-    // Not implemented in Motif
-    m_tickFreq = n;
-}
-
 void wxSlider::SetPageSize(int pageSize)
 {
     // Not implemented in Motif
@@ -203,16 +168,6 @@ int wxSlider::GetPageSize() const
     return m_pageSize;
 }
 
-void wxSlider::ClearSel()
-{
-    // Not implemented in Motif
-}
-
-void wxSlider::ClearTicks()
-{
-    // Not implemented in Motif
-}
-
 void wxSlider::SetLineSize(int lineSize)
 {
     // Not implemented in Motif
@@ -225,23 +180,6 @@ int wxSlider::GetLineSize() const
     return m_lineSize;
 }
 
-int wxSlider::GetSelEnd() const
-{
-    // Not implemented in Motif
-    return 0;
-}
-
-int wxSlider::GetSelStart() const
-{
-    // Not implemented in Motif
-    return 0;
-}
-
-void wxSlider::SetSelection(int WXUNUSED(minPos), int WXUNUSED(maxPos))
-{
-    // Not implemented in Motif
-}
-
 void wxSlider::SetThumbLength(int WXUNUSED(len))
 {
     // Not implemented in Motif (?)
@@ -253,56 +191,44 @@ int wxSlider::GetThumbLength() const
     return 0;
 }
 
-void wxSlider::SetTick(int WXUNUSED(tickPos))
-{
-    // Not implemented in Motif
-}
-
 void wxSlider::Command (wxCommandEvent & event)
 {
     SetValue (event.GetInt());
     ProcessCommand (event);
 }
 
-void wxSlider::ChangeFont(bool keepOriginalSize)
-{
-    wxWindow::ChangeFont(keepOriginalSize);
-}
-
-void wxSlider::ChangeBackgroundColour()
-{
-    wxWindow::ChangeBackgroundColour();
-}
-
-void wxSlider::ChangeForegroundColour()
-{
-    wxWindow::ChangeForegroundColour();
-}
-
-void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs)
+void wxSliderCallback (Widget widget, XtPointer clientData,
+                       XmScaleCallbackStruct * cbs)
 {
     wxSlider *slider = (wxSlider *) clientData;
+    wxEventType scrollEvent;
+
     switch (cbs->reason)
     {
     case XmCR_VALUE_CHANGED:
+        scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
+        break;
+
     case XmCR_DRAG:
+        scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+        break;
+
     default:
-        {
-            // TODO: the XmCR_VALUE_CHANGED case should be handled
-            // differently (it's not sent continually as the slider moves).
-            // In which case we need a similar behaviour for other platforms.
-
-            wxScrollEvent event(wxEVT_SCROLL_THUMBTRACK, slider->GetId());
-            XtVaGetValues (widget, XmNvalue, &event.m_commandInt, NULL);
-            event.SetEventObject(slider);
-            slider->ProcessCommand(event);
-
-            // Also send a wxCommandEvent for compatibility.
-            wxCommandEvent event2(wxEVT_COMMAND_SLIDER_UPDATED, slider->GetId());
-            event2.SetEventObject(slider);
-            slider->ProcessCommand(event2);
-            break;
-        }
+        return;
     }
+
+    wxScrollEvent event(scrollEvent, slider->GetId());
+    int commandInt = event.GetInt();
+    XtVaGetValues (widget, XmNvalue, &commandInt, NULL);
+    event.SetInt(commandInt);
+    event.SetEventObject(slider);
+    slider->GetEventHandler()->ProcessEvent(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);
 }
 
+#endif // wxUSE_SLIDER