X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da175b2ce4dc35cc4c0baa8bbdc16bf4de6c7684..4cb1706ae52c02214a4540c6c4b6882bed5af416:/src/motif/slider.cpp?ds=sidebyside

diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp
index 5493609873..369cecc720 100644
--- a/src/motif/slider.cpp
+++ b/src/motif/slider.cpp
@@ -16,22 +16,26 @@
 #include "wx/slider.h"
 #include "wx/utils.h"
 
+#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>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
-#include <wx/motif/private.h>
+#include "wx/motif/private.h"
 
 void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs);
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 
 BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()
-#endif
 
 
 
@@ -51,31 +55,34 @@ 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);
-    
+
     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;
-    
+
     // Not used in Motif, I think
     m_pageSize = (int)((maxValue-minValue)/10);
-    
+
     Widget parentWidget = (Widget) parent->GetClientWidget();
-    
+
     Widget sliderWidget = XtVaCreateManagedWidget ("sliderWidget",
         xmScaleWidgetClass, parentWidget,
         XmNorientation,
@@ -87,26 +94,34 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         XmNvalue, value,
         XmNshowValue, True,
         NULL);
-    
+
     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, XmNdragCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);
-    
+
     m_font = parent->GetFont();
-    
+
     ChangeFont(FALSE);
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
-    
+
     ChangeBackgroundColour();
-    
+
     return TRUE;
 }
 
@@ -134,30 +149,30 @@ void wxSlider::GetSize(int *width, int *height) const
 void wxSlider::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     Widget widget = (Widget) m_mainWidget;
-    
+
     bool managed = XtIsManaged(widget);
-    
+
     if (managed)
         XtUnmanageChild (widget);
-    
+
     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);
     }
-    
+
     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 (managed)
         XtManageChild (widget);
 }
@@ -166,12 +181,12 @@ void wxSlider::SetRange(int minValue, int maxValue)
 {
     m_rangeMin = minValue;
     m_rangeMax = maxValue;
-    
+
     XtVaSetValues ((Widget) m_mainWidget, XmNminimum, minValue, XmNmaximum, maxValue, NULL);
 }
 
 // For trackbars only
-void wxSlider::SetTickFreq(int n, int pos)
+void wxSlider::SetTickFreq(int n, int WXUNUSED(pos))
 {
     // Not implemented in Motif
     m_tickFreq = n;
@@ -276,15 +291,16 @@ void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruc
             // 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);
+            event2.SetInt( event.GetInt() );
             slider->ProcessCommand(event2);
             break;
         }