X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4294b7832a5aed3c1cccc06aecd227d43da8830..227e5e99cd140e628d431dc006d30447ed6ad81a:/src/motif/slider.cpp

diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp
index 244843b4d8..ab2b4f6e4a 100644
--- a/src/motif/slider.cpp
+++ b/src/motif/slider.cpp
@@ -38,71 +38,75 @@ END_EVENT_TABLE()
 // 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;
+    m_tickFreq = 0;
 }
 
 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);
-
+    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();
+        m_windowId = (int)NewControlId();
     else
-	    m_windowId = id;
-
+        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,
-           (((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;
-
+    
     if(style & wxSL_NOTIFY_DRAG)
         XtAddCallback (sliderWidget, XmNdragCallback,
-                   (XtCallbackProc) wxSliderCallback, (XtPointer) this);
+        (XtCallbackProc) wxSliderCallback, (XtPointer) this);
     else
         XtAddCallback (sliderWidget, XmNvalueChangedCallback,
-                   (XtCallbackProc) wxSliderCallback, (XtPointer) this);
-
+        (XtCallbackProc) wxSliderCallback, (XtPointer) this);
+    
     XtAddCallback (sliderWidget, XmNdragCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);
-
+    
+    m_windowFont = parent->GetFont();
+    
+    ChangeFont(FALSE);
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
-
-    SetFont(* parent->GetFont());
-    ChangeColour(m_mainWidget);
-
+    
+    ChangeBackgroundColour();
+    
     return TRUE;
 }
 
@@ -127,42 +131,42 @@ void wxSlider::GetSize(int *width, int *height) const
     wxControl::GetSize(width, height);
 }
 
-void wxSlider::SetSize(int x, int y, int width, int height, int sizeFlags)
+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);
+    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);
 }
 
 void wxSlider::SetRange(int minValue, int maxValue)
 {
     m_rangeMin = minValue;
     m_rangeMax = maxValue;
-
+    
     XtVaSetValues ((Widget) m_mainWidget, XmNminimum, minValue, XmNmaximum, maxValue, NULL);
 }
 
@@ -241,8 +245,23 @@ void wxSlider::SetTick(int WXUNUSED(tickPos))
 
 void wxSlider::Command (wxCommandEvent & event)
 {
-  SetValue (event.GetInt());
-  ProcessCommand (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)
@@ -250,18 +269,23 @@ void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruc
     wxSlider *slider = (wxSlider *) clientData;
     switch (cbs->reason)
     {
-        case XmCR_VALUE_CHANGED:
-        case XmCR_DRAG:
-        default:
+    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);
+            
+            // Also send a wxCommandEvent for compatibility.
+            wxCommandEvent event2(wxEVT_COMMAND_SLIDER_UPDATED, slider->GetId());
+            event2.SetEventObject(slider);
+            slider->ProcessCommand(event2);
             break;
         }
     }