Bugfix in GSocket_Cleanup()

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

diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp
index 20a1b07711455987b1a875607aaf22fe8593e1e2..5d3d92125ef2dbef5a90812ebfc8d6cf4f734ead 100644 (file)
--- a/src/motif/slider.cpp
+++ b/src/motif/slider.cpp
@@ -38,19 +38,19 @@ END_EVENT_TABLE()
 // 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;
+    m_tickFreq = 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);
 {
     SetName(name);
     SetValidator(validator);


@@ -64,9 +64,9 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     m_tickFreq = 0;
 
     if ( id == -1 )
     m_tickFreq = 0;
 
     if ( id == -1 )

-           m_windowId = (int)NewControlId();
+        m_windowId = (int)NewControlId();

     else
     else

-           m_windowId = id;
+        m_windowId = id;

 
     m_rangeMax = maxValue;
     m_rangeMin = minValue;
 
     m_rangeMax = maxValue;
     m_rangeMin = minValue;


@@ -77,32 +77,34 @@ 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;
 
     if(style & wxSL_NOTIFY_DRAG)
         XtAddCallback (sliderWidget, XmNdragCallback,
 
     m_mainWidget = (WXWidget) sliderWidget;
 
     if(style & wxSL_NOTIFY_DRAG)
         XtAddCallback (sliderWidget, XmNdragCallback,

-                   (XtCallbackProc) wxSliderCallback, (XtPointer) this);
+        (XtCallbackProc) wxSliderCallback, (XtPointer) this);

     else
         XtAddCallback (sliderWidget, XmNvalueChangedCallback,
     else
         XtAddCallback (sliderWidget, XmNvalueChangedCallback,

-                   (XtCallbackProc) wxSliderCallback, (XtPointer) this);
+        (XtCallbackProc) wxSliderCallback, (XtPointer) this);

 
     XtAddCallback (sliderWidget, XmNdragCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);
 
 
     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);
 
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 

-    SetFont(* parent->GetFont());

     ChangeBackgroundColour();
 
     return TRUE;
     ChangeBackgroundColour();
 
     return TRUE;


@@ -129,35 +131,35 @@ void wxSlider::GetSize(int *width, int *height) const
     wxControl::GetSize(width, height);
 }
 
     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;
+    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)


@@ -243,23 +245,23 @@ void wxSlider::SetTick(int WXUNUSED(tickPos))
 
 void wxSlider::Command (wxCommandEvent & event)
 {
 
 void wxSlider::Command (wxCommandEvent & event)
 {

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

 }
 
 }
 

-void wxSlider::ChangeFont()
+void wxSlider::ChangeFont(bool keepOriginalSize)

 {
 {

-    // TODO
+    wxWindow::ChangeFont(keepOriginalSize);

 }
 
 void wxSlider::ChangeBackgroundColour()
 {
 }
 
 void wxSlider::ChangeBackgroundColour()
 {

-    // TODO
+    wxWindow::ChangeBackgroundColour();

 }
 
 void wxSlider::ChangeForegroundColour()
 {
 }
 
 void wxSlider::ChangeForegroundColour()
 {

-    // TODO
+    wxWindow::ChangeForegroundColour();

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


@@ -267,9 +269,9 @@ void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruc
     wxSlider *slider = (wxSlider *) clientData;
     switch (cbs->reason)
     {
     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).
         {
             // TODO: the XmCR_VALUE_CHANGED case should be handled
             // differently (it's not sent continually as the slider moves).


@@ -279,6 +281,11 @@ void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruc
             XtVaGetValues (widget, XmNvalue, &event.m_commandInt, NULL);
             event.SetEventObject(slider);
             slider->ProcessCommand(event);
             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;
         }
     }
             break;
         }
     }