Rewrote wxRibbonPage realisation and layout code to avoid setting the position and...

[wxWidgets.git] / src / osx / slider_osx.cpp

diff --git a/src/osx/slider_osx.cpp b/src/osx/slider_osx.cpp
index ce4815ad3d9e2c028f8a115677372631ecb99eef..cfa7fffc516353576304410d5cc560bd1ac6f6cc 100644 (file)
--- a/src/osx/slider_osx.cpp
+++ b/src/osx/slider_osx.cpp
@@ -22,7 +22,7 @@ BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()
 
  // The dimensions of the different styles of sliders (from Aqua document)
 END_EVENT_TABLE()
 
  // The dimensions of the different styles of sliders (from Aqua document)

-#ifdef wxOSX_USE_COCOA
+#if wxOSX_USE_COCOA

     #define wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS 28
     #define wxSLIDER_DIMENSIONACROSS_ARROW 21
 #else
     #define wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS 28
     #define wxSLIDER_DIMENSIONACROSS_ARROW 21
 #else


@@ -186,9 +186,9 @@ void wxSlider::SetRange(int minValue, int maxValue)
         m_macMaximumStatic->SetLabel( value );
     }
 
         m_macMaximumStatic->SetLabel( value );
     }
 

-    // If the range is out of bounds, set it to a 
+    // If the range is out of bounds, set it to a

     // value that is within bounds
     // value that is within bounds

-    // RN: Testing reveals OSX does its own 
+    // RN: Testing reveals OSX does its own

     // bounding, perhaps this isn't needed?
     int currentValue = GetValue();
 
     // bounding, perhaps this isn't needed?
     int currentValue = GetValue();
 


@@ -296,10 +296,10 @@ void wxSlider::TriggerScrollEvent( wxEventType scrollEvent)
     HandleWindowEvent( cevent );
 }
 
     HandleWindowEvent( cevent );
 }
 

-bool wxSlider::OSXHandleClicked( double timestampsec )
+bool wxSlider::OSXHandleClicked( double WXUNUSED(timestampsec) )

 {
     TriggerScrollEvent(wxEVT_SCROLL_THUMBRELEASE);
 {
     TriggerScrollEvent(wxEVT_SCROLL_THUMBRELEASE);

- 
+

     return true;
 }
 
     return true;
 }