Compilation fix for STL build after the last commit.

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

diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp
index 244843b4d8120c0032a4daf3ffdb1ce81e4a9692..70c5c66a24aa3a94624fab6521cc04c5e45c514a 100644 (file)
--- a/src/motif/slider.cpp
+++ b/src/motif/slider.cpp
@@ -1,70 +1,71 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // 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/slider.h"

-#include "wx/utils.h"

 
 

+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 #include <Xm/RowColumn.h>
 #include <Xm/Scale.h>
 #include <Xm/Xm.h>
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 #include <Xm/RowColumn.h>
 #include <Xm/Scale.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 

-#include <wx/motif/private.h>
-
-void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs);
+#include "wx/motif/private.h"

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
+static void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs);

 
 BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()

-#endif

 
 
 
 // Slider
 wxSlider::wxSlider()
 {
 
 
 
 // Slider
 wxSlider::wxSlider()
 {

-  m_pageSize = 1;
-  m_lineSize = 1;
-  m_rangeMax = 0;
-  m_rangeMin = 0;
-  m_tickFreq = 0;
+    m_pageSize = 1;
+    m_lineSize = 1;
+    m_rangeMax = 0;
+    m_rangeMin = 0;

 }
 
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,

-           int value, int minValue, int maxValue,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+                      int value, int minValue, int maxValue,
+                      const wxPoint& pos,
+                      const wxSize& size, long style,
+                      const wxValidator& validator,
+                      const wxString& name)

 {
 {

-    SetName(name);
-    SetValidator(validator);
+    if ( !((style & wxSL_HORIZONTAL) || (style & wxSL_VERTICAL)) )
+         style |= wxSL_HORIZONTAL;

 
 

-    if (parent) parent->AddChild(this);
+    if( !CreateControl( parent, id, pos, size, style, validator, name ) )
+        return false;
+    PreCreation();

 
     m_lineSize = 1;
     m_windowStyle = style;
 
     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;
 
     m_rangeMax = maxValue;
     m_rangeMin = minValue;


@@ -75,35 +76,26 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     Widget sliderWidget = XtVaCreateManagedWidget ("sliderWidget",
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     Widget sliderWidget = XtVaCreateManagedWidget ("sliderWidget",

-                                            xmScaleWidgetClass, parentWidget,
-                         XmNorientation,
-           (((m_windowStyle & wxSL_VERTICAL) == wxSL_VERTICAL) ? XmVERTICAL : XmHORIZONTAL),
-                                        XmNprocessingDirection,
-           (((m_windowStyle & wxSL_VERTICAL) == wxSL_VERTICAL) ? XmMAX_ON_TOP : XmMAX_ON_RIGHT),
-                                                XmNmaximum, maxValue,
-                                                XmNminimum, minValue,
-                                                XmNvalue, value,
-                                                XmNshowValue, True,
-                                                NULL);
+        xmScaleWidgetClass, parentWidget,
+        XmNorientation,
+        (((m_windowStyle & wxSL_VERTICAL) == wxSL_VERTICAL) ? XmVERTICAL : XmHORIZONTAL),
+        XmNprocessingDirection,
+        (((m_windowStyle & wxSL_VERTICAL) == wxSL_VERTICAL) ? XmMAX_ON_TOP : XmMAX_ON_RIGHT),
+        XmNmaximum, maxValue,
+        XmNminimum, minValue,
+        XmNvalue, value,
+        XmNshowValue, True,
+        NULL);

 
     m_mainWidget = (WXWidget) sliderWidget;
 
 
     m_mainWidget = (WXWidget) sliderWidget;
 

-    if(style & wxSL_NOTIFY_DRAG)
-        XtAddCallback (sliderWidget, XmNdragCallback,
-                   (XtCallbackProc) wxSliderCallback, (XtPointer) this);
-    else
-        XtAddCallback (sliderWidget, XmNvalueChangedCallback,
-                   (XtCallbackProc) wxSliderCallback, (XtPointer) this);
-
+    XtAddCallback (sliderWidget, XmNvalueChangedCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);

     XtAddCallback (sliderWidget, XmNdragCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);
 
     XtAddCallback (sliderWidget, XmNdragCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);
 

-    SetCanAddEventHandler(TRUE);
+    PostCreation();

     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 

-    SetFont(* parent->GetFont());
-    ChangeColour(m_mainWidget);
-
-    return TRUE;
+    return true;

 }
 
 wxSlider::~wxSlider()
 }
 
 wxSlider::~wxSlider()


@@ -122,40 +114,35 @@ void wxSlider::SetValue(int value)
     XtVaSetValues ((Widget) m_mainWidget, XmNvalue, value, NULL);
 }
 
     XtVaSetValues ((Widget) m_mainWidget, XmNvalue, value, NULL);
 }
 

-void wxSlider::GetSize(int *width, int *height) const
+void wxSlider::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
 {

-    wxControl::GetSize(width, height);
-}
+    Widget widget = (Widget) m_mainWidget;

 
 

-void wxSlider::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-  Widget widget = (Widget) m_mainWidget;
+    bool managed = XtIsManaged(widget);

 
 

-  bool managed = XtIsManaged(widget);
+    if (managed)
+        XtUnmanageChild (widget);

 
 

-  if (managed)
-    XtUnmanageChild (widget);
-
-  if (((m_windowStyle & wxHORIZONTAL) == wxHORIZONTAL) && (width > -1))
-  {
-    XtVaSetValues (widget, XmNscaleWidth, wxMax (width, 10), NULL);
-  }
+    if (((m_windowStyle & wxHORIZONTAL) == wxHORIZONTAL) && (width > -1))
+    {
+        XtVaSetValues (widget, XmNscaleWidth, wxMax (width, 10), NULL);
+    }

 
 

-  if (((m_windowStyle & wxVERTICAL) == wxVERTICAL) && (height > -1))
-  {
-    XtVaSetValues (widget, XmNscaleHeight, wxMax (height, 10), NULL);
-  }
+    if (((m_windowStyle & wxVERTICAL) == wxVERTICAL) && (height > -1))
+    {
+        XtVaSetValues (widget, XmNscaleHeight, wxMax (height, 10), NULL);
+    }

 
 

-  int xx = x; int yy = y;
-  AdjustForParentClientOrigin(xx, yy, sizeFlags);
+    int xx = x; int yy = y;
+    AdjustForParentClientOrigin(xx, yy, sizeFlags);

 
 

-  if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    XtVaSetValues (widget, XmNx, xx, NULL);
-  if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    XtVaSetValues (widget, XmNy, yy, NULL);
+    if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        XtVaSetValues (widget, XmNx, xx, NULL);
+    if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        XtVaSetValues (widget, XmNy, yy, NULL);

 
 

-  if (managed)
-    XtManageChild (widget);
+    if (managed)
+        XtManageChild (widget);

 }
 
 void wxSlider::SetRange(int minValue, int maxValue)
 }
 
 void wxSlider::SetRange(int minValue, int maxValue)


@@ -167,12 +154,6 @@ void wxSlider::SetRange(int minValue, int maxValue)
 }
 
 // For trackbars only
 }
 
 // For trackbars only

-void wxSlider::SetTickFreq(int n, int pos)
-{
-    // Not implemented in Motif
-    m_tickFreq = n;
-}
-

 void wxSlider::SetPageSize(int pageSize)
 {
     // Not implemented in Motif
 void wxSlider::SetPageSize(int pageSize)
 {
     // Not implemented in Motif


@@ -184,16 +165,6 @@ int wxSlider::GetPageSize() const
     return m_pageSize;
 }
 
     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
 void wxSlider::SetLineSize(int lineSize)
 {
     // Not implemented in Motif


@@ -206,23 +177,6 @@ int wxSlider::GetLineSize() const
     return m_lineSize;
 }
 
     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 (?)
 void wxSlider::SetThumbLength(int WXUNUSED(len))
 {
     // Not implemented in Motif (?)


@@ -234,36 +188,44 @@ int wxSlider::GetThumbLength() const
     return 0;
 }
 
     return 0;
 }
 

-void wxSlider::SetTick(int WXUNUSED(tickPos))
-{
-    // Not implemented in Motif
-}
-

 void wxSlider::Command (wxCommandEvent & event)
 {
 void wxSlider::Command (wxCommandEvent & event)
 {

-  SetValue (event.GetInt());
-  ProcessCommand (event);
+    SetValue (event.GetInt());
+    ProcessCommand (event);

 }
 
 }
 

-void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs)
+void wxSliderCallback (Widget widget, XtPointer clientData,
+                       XmScaleCallbackStruct * cbs)

 {
     wxSlider *slider = (wxSlider *) clientData;
 {
     wxSlider *slider = (wxSlider *) clientData;

+    wxEventType scrollEvent;
+

     switch (cbs->reason)
     {
     switch (cbs->reason)
     {

-        case XmCR_VALUE_CHANGED:
-        case XmCR_DRAG:
-        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);
-            break;
-        }
+    case XmCR_VALUE_CHANGED:
+        scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
+        break;
+
+    case XmCR_DRAG:
+        scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+        break;
+
+    default:
+        return;

     }
     }

+
+    wxScrollEvent event(scrollEvent, slider->GetId());
+    int commandInt = event.GetInt();
+    XtVaGetValues (widget, XmNvalue, &commandInt, NULL);
+    event.SetInt(commandInt);
+    event.SetEventObject(slider);
+    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->HandleWindowEvent(event2);

 }
 
 }
 

+#endif // wxUSE_SLIDER