Document lack of wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK under OS X.

[wxWidgets.git] / src / osx / carbon / slider.cpp

diff --git a/src/osx/carbon/slider.cpp b/src/osx/carbon/slider.cpp
index 11d2301592039d1da8c7a5370ac6f726548c0d38..ad2bc14334f2e7230bd4feb106772570e976a095 100644 (file)
--- a/src/osx/carbon/slider.cpp
+++ b/src/osx/carbon/slider.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        slider.cpp
+// Name:        src/osx/carbon/slider.cpp

 // Purpose:     wxSlider
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxSlider
 // Author:      Stefan Csomor
 // Modified by:


@@ -16,15 +16,31 @@
 #include "wx/slider.h"
 #include "wx/osx/private.h"
 
 #include "wx/slider.h"
 #include "wx/osx/private.h"
 

-wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID WXUNUSED(id), 
+class wxMacSliderCarbonControl : public wxMacControl
+{
+public :
+    wxMacSliderCarbonControl( wxWindowMac* peer ) : wxMacControl( peer )
+    {
+    }
+    
+    // work around an OSX bug : if the control is having the keyboard focus it cannot
+    // be set to the full max/min values by dragging
+    virtual bool CanFocus() const
+    { 
+        return false; 
+    }
+};
+
+
+wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),

                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );


@@ -32,13 +48,13 @@ wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer,
     if ( style & wxSL_AUTOTICKS )
         tickMarks = (maximum - minimum) + 1; // +1 for the 0 value
 
     if ( style & wxSL_AUTOTICKS )
         tickMarks = (maximum - minimum) + 1; // +1 for the 0 value
 

-    // keep the number of tickmarks from becoming unwieldly, therefore below it is ok to cast
+    // keep the number of tickmarks from becoming unwieldy, therefore below it is ok to cast

     // it to a UInt16
     while (tickMarks > 20)
         tickMarks /= 5;
 
 
     // it to a UInt16
     while (tickMarks > 20)
         tickMarks /= 5;
 
 

-    wxMacControl* peer = new wxMacControl( wxpeer );
+    wxMacControl* peer = new wxMacSliderCarbonControl( wxpeer );

     OSStatus err = CreateSliderControl(
         MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
         value, minimum, maximum,
     OSStatus err = CreateSliderControl(
         MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
         value, minimum, maximum,