Only test the high order bit from GetKeyState, otherwise we can have

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

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index e90a51039808d2b70801565001e26df8df8d8a56..79f83f1b52ebbe378e69f8555950cb34fae5b1c5 100644 (file)
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "slider.h"
 #endif
 
 #pragma implementation "slider.h"
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_SLIDER
+

 #include "wx/slider.h"
 #include "wx/mac/uma.h"
 
 #include "wx/slider.h"
 #include "wx/mac/uma.h"
 


@@ -27,15 +31,15 @@ END_EVENT_TABLE()
 #define wxSLIDER_DIMENSIONACROSS 15
 #define wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS 24
 #define wxSLIDER_DIMENSIONACROSS_ARROW 18
 #define wxSLIDER_DIMENSIONACROSS 15
 #define wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS 24
 #define wxSLIDER_DIMENSIONACROSS_ARROW 18

- 
+

 // Distance between slider and text
 #define wxSLIDER_BORDERTEXT 5
 // Distance between slider and text
 #define wxSLIDER_BORDERTEXT 5

- 
+

 /* NB!  The default orientation for a slider is horizontal however if the user specifies
  * some slider styles but dosen't specify the orientation we have to assume he wants a
  * horizontal one.  Therefore in this file when testing for the sliders orientation
  * vertical is tested for if this is not set then we use the horizontal one
 /* NB!  The default orientation for a slider is horizontal however if the user specifies
  * some slider styles but dosen't specify the orientation we have to assume he wants a
  * horizontal one.  Therefore in this file when testing for the sliders orientation
  * vertical is tested for if this is not set then we use the horizontal one

- * eg.  if(GetWindowStyle() & wxSL_VERTICAL) {}  else { horizontal case }>  
+ * eg.  if(GetWindowStyle() & wxSL_VERTICAL) {}  else { horizontal case }>

  */
 
  // Slider
  */
 
  // Slider


@@ -57,39 +61,43 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
                       const wxValidator& validator,
                       const wxString& name)
 {
                       const wxValidator& validator,
                       const wxString& name)
 {

-    m_macIsUserPane = FALSE ;
-    
+    m_macIsUserPane = false ;
+

     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     m_macMinimumStatic = NULL ;
     m_macMaximumStatic = NULL ;
     m_macValueStatic = NULL ;
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     m_macMinimumStatic = NULL ;
     m_macMaximumStatic = NULL ;
     m_macValueStatic = NULL ;

-    
-    
+
+

     m_lineSize = 1;
     m_tickFreq = 0;
     m_lineSize = 1;
     m_tickFreq = 0;

-    
+

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

-    
+

     m_pageSize = (int)((maxValue-minValue)/10);
     m_pageSize = (int)((maxValue-minValue)/10);

-    
-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;    
-    
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+
+    //
+    // NB: (RN) Ticks here are sometimes off in the GUI if there
+    // is not as many ticks as there are values
+    //

     UInt16 tickMarks = 0 ;
     if ( style & wxSL_AUTOTICKS )
     UInt16 tickMarks = 0 ;
     if ( style & wxSL_AUTOTICKS )

-        tickMarks = (maxValue - minValue); 
-        
-    if (tickMarks > 20)
-        tickMarks = tickMarks/5; //keep the number of tickmarks from becoming unwieldly
-        
+        tickMarks = (maxValue - minValue) + 1; //+1 for the 0 value
+
+    while (tickMarks > 20)
+            tickMarks /= 5; //keep the number of tickmarks from becoming unwieldly
+

     m_peer = new wxMacControl() ;
     m_peer = new wxMacControl() ;

-    verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 
+    verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,

     value , minValue , maxValue , kControlSliderPointsDownOrRight , tickMarks , true /* liveTracking */ ,
     value , minValue , maxValue , kControlSliderPointsDownOrRight , tickMarks , true /* liveTracking */ ,

-        wxMacLiveScrollbarActionUPP , *m_peer ) );
-    
-        
+        wxMacLiveScrollbarActionUPP , m_peer->GetControlRefAddr() ) );
+
+

     if(style & wxSL_VERTICAL) {
         SetSizeHints(10, -1, 10, -1);  // Forces SetSize to use the proper width
     }
     if(style & wxSL_VERTICAL) {
         SetSizeHints(10, -1, 10, -1);  // Forces SetSize to use the proper width
     }


@@ -99,52 +107,57 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     // NB!  SetSizeHints is overloaded by wxSlider and will substitute 10 with the
     // proper dimensions, it also means other people cannot bugger the slider with
     // other values
     // NB!  SetSizeHints is overloaded by wxSlider and will substitute 10 with the
     // proper dimensions, it also means other people cannot bugger the slider with
     // other values

-    
+

     if(style & wxSL_LABELS)
     {
     if(style & wxSL_LABELS)
     {

-        m_macMinimumStatic = new wxStaticText( parent, -1, wxEmptyString );
-        m_macMaximumStatic = new wxStaticText( parent, -1, wxEmptyString );
-        m_macValueStatic = new wxStaticText( parent, -1, wxEmptyString );
+        m_macMinimumStatic = new wxStaticText( parent, wxID_ANY, wxEmptyString );
+        m_macMaximumStatic = new wxStaticText( parent, wxID_ANY, wxEmptyString );
+        m_macValueStatic = new wxStaticText( parent, wxID_ANY, wxEmptyString );

         SetRange(minValue, maxValue);
         SetValue(value);
     }
 
     MacPostControlCreate(pos,size) ;
         SetRange(minValue, maxValue);
         SetValue(value);
     }
 
     MacPostControlCreate(pos,size) ;

-    
+

     return true;
 }
 
 wxSlider::~wxSlider()
 {
     return true;
 }
 
 wxSlider::~wxSlider()
 {

-    delete m_macMinimumStatic ;
-    delete m_macMaximumStatic ;
-    delete m_macValueStatic ;
+    // this is a special case, as we had to add windows as siblings we are 
+    // responsible for their disposal, but only if we are not part of a DestroyAllChildren
+    if ( m_parent && m_parent->IsBeingDeleted() == false )
+    {
+        delete m_macMinimumStatic ;
+        delete m_macMaximumStatic ;
+        delete m_macValueStatic ;
+    }

 }
 
 int wxSlider::GetValue() const
 {
 }
 
 int wxSlider::GetValue() const
 {

-    return GetControl32BitValue( *m_peer) ;
+    return m_peer->GetValue() ;

 }
 
 void wxSlider::SetValue(int value)
 {
     wxString valuestring ;
 }
 
 void wxSlider::SetValue(int value)
 {
     wxString valuestring ;

-    valuestring.Printf( wxT("%d") , value ) ;    
+    valuestring.Printf( wxT("%d") , value ) ;

     if ( m_macValueStatic )
         m_macValueStatic->SetLabel( valuestring ) ;
     if ( m_macValueStatic )
         m_macValueStatic->SetLabel( valuestring ) ;

-    SetControl32BitValue( *m_peer , value ) ;
+    m_peer->SetValue( value ) ;

 }
 
 void wxSlider::SetRange(int minValue, int maxValue)
 {
     wxString value;
 }
 
 void wxSlider::SetRange(int minValue, int maxValue)
 {
     wxString value;

-    
+

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

-    
-    SetControl32BitMinimum( *m_peer, m_rangeMin);
-    SetControl32BitMaximum( *m_peer, m_rangeMax);
-    
+
+    m_peer->SetMinimum( m_rangeMin);
+    m_peer->SetMaximum( m_rangeMax);
+

     if(m_macMinimumStatic) {
         value.Printf(wxT("%d"), m_rangeMin);
         m_macMinimumStatic->SetLabel(value);
     if(m_macMinimumStatic) {
         value.Printf(wxT("%d"), m_rangeMin);
         m_macMinimumStatic->SetLabel(value);


@@ -235,47 +248,47 @@ void wxSlider::Command (wxCommandEvent & event)
     ProcessCommand (event);
 }
 
     ProcessCommand (event);
 }
 

-void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart, bool mouseStillDown ) 
+void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart, bool mouseStillDown )

 {
 {

-    SInt16 value = ::GetControl32BitValue( *m_peer ) ;
-    
-    SetValue( value ) ;        
-    
+    SInt16 value = m_peer->GetValue() ;
+
+    SetValue( value ) ;
+

     wxEventType scrollEvent = wxEVT_NULL ;
     wxEventType scrollEvent = wxEVT_NULL ;

-    
+

     scrollEvent = wxEVT_SCROLL_THUMBTRACK;
     scrollEvent = wxEVT_SCROLL_THUMBTRACK;

-    
+

     wxScrollEvent event(scrollEvent, m_windowId);
     event.SetPosition(value);
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent(event);
     wxScrollEvent event(scrollEvent, m_windowId);
     event.SetPosition(value);
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent(event);

-    
+

     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId );
     cevent.SetInt( value );
     cevent.SetEventObject( this );
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId );
     cevent.SetInt( value );
     cevent.SetEventObject( this );

-    
+

     GetEventHandler()->ProcessEvent( cevent );
 }
 
     GetEventHandler()->ProcessEvent( cevent );
 }
 

-wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) 
+wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent )

 {
 {

-    SInt16 value = ::GetControl32BitValue( *m_peer ) ;
-    
-    SetValue( value ) ;        
-    
+    SInt16 value = m_peer->GetValue() ;
+
+    SetValue( value ) ;
+

     wxEventType scrollEvent = wxEVT_NULL ;
     wxEventType scrollEvent = wxEVT_NULL ;

-    
+

     scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
     scrollEvent = wxEVT_SCROLL_THUMBRELEASE;

-    
+

     wxScrollEvent event(scrollEvent, m_windowId);
     event.SetPosition(value);
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent(event);
     wxScrollEvent event(scrollEvent, m_windowId);
     event.SetPosition(value);
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent(event);

-    
+

     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId );
     cevent.SetInt( value );
     cevent.SetEventObject( this );
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId );
     cevent.SetInt( value );
     cevent.SetEventObject( this );

-    
+

     GetEventHandler()->ProcessEvent( cevent );
     return noErr ;
 }
     GetEventHandler()->ProcessEvent( cevent );
     return noErr ;
 }


@@ -283,17 +296,17 @@ wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent )
 
 /* This is overloaded in wxSlider so that the proper width/height will always be used
 * for the slider different values would cause redrawing and mouse detection problems */
 
 /* This is overloaded in wxSlider so that the proper width/height will always be used
 * for the slider different values would cause redrawing and mouse detection problems */

-void wxSlider::SetSizeHints( int minW, int minH,
-                            int maxW , int maxH ,
-                            int incW , int incH )
+void wxSlider::DoSetSizeHints( int minW, int minH,
+                               int maxW , int maxH ,
+                               int incW , int incH )

 {
     wxSize size = GetBestSize();
 {
     wxSize size = GetBestSize();

-    
+

     if(GetWindowStyle() & wxSL_VERTICAL) {
     if(GetWindowStyle() & wxSL_VERTICAL) {

-        wxWindow::SetSizeHints(size.x, minH, size.x, maxH, incW, incH);
+        wxWindow::DoSetSizeHints(size.x, minH, size.x, maxH, incW, incH);

     }
     else {
     }
     else {

-        wxWindow::SetSizeHints(minW, size.y, maxW, size.y, incW, incH);
+        wxWindow::DoSetSizeHints(minW, size.y, maxW, size.y, incW, incH);

     }
 }
 
     }
 }
 


@@ -301,12 +314,12 @@ wxSize wxSlider::DoGetBestSize() const
 {
     wxSize size;
     int textwidth, textheight;
 {
     wxSize size;
     int textwidth, textheight;

-    
+

     if(GetWindowStyle() & wxSL_LABELS)
     {
         wxString text;
         int ht, wd;
     if(GetWindowStyle() & wxSL_LABELS)
     {
         wxString text;
         int ht, wd;

-        
+

         // Get maximum text label width and height
         text.Printf(wxT("%d"), m_rangeMin);
         GetTextExtent(text, &textwidth, &textheight);
         // Get maximum text label width and height
         text.Printf(wxT("%d"), m_rangeMin);
         GetTextExtent(text, &textwidth, &textheight);


@@ -319,7 +332,7 @@ wxSize wxSlider::DoGetBestSize() const
             textwidth = wd;
         }
     }
             textwidth = wd;
         }
     }

-    
+

     if(GetWindowStyle() & wxSL_VERTICAL)
     {
         if(GetWindowStyle() & wxSL_AUTOTICKS) {
     if(GetWindowStyle() & wxSL_VERTICAL)
     {
         if(GetWindowStyle() & wxSL_AUTOTICKS) {


@@ -354,7 +367,7 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
     int  xborder, yborder;
     int  minValWidth, maxValWidth, textwidth, textheight;
     int  sliderBreadth;
     int  xborder, yborder;
     int  minValWidth, maxValWidth, textwidth, textheight;
     int  sliderBreadth;

-    
+

     xborder = yborder = 0;
 
     if (GetWindowStyle() & wxSL_LABELS)
     xborder = yborder = 0;
 
     if (GetWindowStyle() & wxSL_LABELS)


@@ -365,10 +378,10 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
         //relative to its parent in order to size properly, so
         //move the control first so we can use GetPosition()
         wxControl::DoSetSize( x, y , w , h ,sizeFlags ) ;
         //relative to its parent in order to size properly, so
         //move the control first so we can use GetPosition()
         wxControl::DoSetSize( x, y , w , h ,sizeFlags ) ;

-    
+

         wxString text;
         int ht;
         wxString text;
         int ht;

-        
+

         // Get maximum text label width and height
         text.Printf(wxT("%d"), m_rangeMin);
         GetTextExtent(text, &minValWidth, &textheight);
         // Get maximum text label width and height
         text.Printf(wxT("%d"), m_rangeMin);
         GetTextExtent(text, &minValWidth, &textheight);


@@ -378,10 +391,10 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
             textheight = ht;
         }
         textwidth = (minValWidth > maxValWidth ? minValWidth : maxValWidth);
             textheight = ht;
         }
         textwidth = (minValWidth > maxValWidth ? minValWidth : maxValWidth);

-        
+

         xborder = textwidth + wxSLIDER_BORDERTEXT;
         yborder = textheight + wxSLIDER_BORDERTEXT;
         xborder = textwidth + wxSLIDER_BORDERTEXT;
         yborder = textheight + wxSLIDER_BORDERTEXT;

-        
+

         // Get slider breadth
         if(GetWindowStyle() & wxSL_AUTOTICKS) {
             sliderBreadth = wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS;
         // Get slider breadth
         if(GetWindowStyle() & wxSL_AUTOTICKS) {
             sliderBreadth = wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS;


@@ -389,18 +402,18 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
         else {
             sliderBreadth = wxSLIDER_DIMENSIONACROSS_ARROW;
         }
         else {
             sliderBreadth = wxSLIDER_DIMENSIONACROSS_ARROW;
         }

-        
+

         if(GetWindowStyle() & wxSL_VERTICAL)
         {
             h = h - yborder ;
         if(GetWindowStyle() & wxSL_VERTICAL)
         {
             h = h - yborder ;

-                        
+

             if ( m_macMinimumStatic )
                 m_macMinimumStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT,
             if ( m_macMinimumStatic )
                 m_macMinimumStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT,

-                GetPosition().y + h - yborder - textheight);
+                GetPosition().y + h - yborder);

             if ( m_macMaximumStatic )
                 m_macMaximumStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT, GetPosition().y + 0);
             if ( m_macValueStatic )
             if ( m_macMaximumStatic )
                 m_macMaximumStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT, GetPosition().y + 0);
             if ( m_macValueStatic )

-                m_macValueStatic->Move(GetPosition().x, GetPosition().y + h - textheight);
+                m_macValueStatic->Move(GetPosition().x, GetPosition().y + h );

         }
         else
         {
         }
         else
         {


@@ -415,7 +428,7 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
         }
     }
     //If the control has labels, we still need to call this again because
         }
     }
     //If the control has labels, we still need to call this again because

-    //the labels alter the control's w and h values. 
+    //the labels alter the control's w and h values.

     wxControl::DoSetSize( x, y , w , h ,sizeFlags ) ;
 
 }
     wxControl::DoSetSize( x, y , w , h ,sizeFlags ) ;
 
 }


@@ -424,3 +437,5 @@ void wxSlider::DoMoveWindow(int x, int y, int width, int height)
 {
     wxControl::DoMoveWindow(x,y,width,height) ;
 }
 {
     wxControl::DoMoveWindow(x,y,width,height) ;
 }

+
+#endif // wxUSE_SLIDER