Compile fixes.

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

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index 87d4e586098060c40ae7ebbee9c37ce375554be6..0c73cb27bf27cf37334683b9cb9d961f7c4c9d1f 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,54 +61,39 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
                       const wxValidator& validator,
                       const wxString& name)
 {
                       const wxValidator& validator,
                       const wxString& name)
 {

-    Rect bounds ;
-    Str255 title ;
-    SInt16 procID;
-    
+    m_macIsUserPane = false ;
+
+    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
+        return false;
+

     m_macMinimumStatic = NULL ;
     m_macMaximumStatic = NULL ;
     m_macValueStatic = NULL ;
     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);

-    
-    MacPreControlCreate( parent, id, wxEmptyString, pos, size, style,
-        validator, name, &bounds, title );
-    
-    procID = kControlSliderProc + kControlSliderLiveFeedback;
-    if(style & wxSL_AUTOTICKS) {
-        procID += kControlSliderHasTickMarks;
-    }
-    
-    
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, title, false,
-        value, minValue, maxValue, procID, (long) this);
-    
-    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
-    
-    ::SetControlAction( (ControlHandle) m_macControl , wxMacLiveScrollbarActionUPP ) ;
-    
-    if(style & wxSL_LABELS)
-    {
-        m_macMinimumStatic = new wxStaticText( this, -1, wxEmptyString );
-        m_macMaximumStatic = new wxStaticText( this, -1, wxEmptyString );
-        m_macValueStatic = new wxStaticText( this, -1, wxEmptyString );
-        SetRange(minValue, maxValue);
-        SetValue(value);
-    }
-    
-    else {
-        m_macMinimumStatic = NULL ;
-        m_macMaximumStatic = NULL ;
-        m_macValueStatic = NULL ;
-    }
-    
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+
+    UInt16 tickMarks = 0 ;
+    if ( style & wxSL_AUTOTICKS )
+        tickMarks = (maxValue - minValue);
+
+    if (tickMarks > 20)
+        tickMarks = tickMarks/5; //keep the number of tickmarks from becoming unwieldly
+
+    m_peer = new wxMacControl() ;
+    verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
+    value , minValue , maxValue , kControlSliderPointsDownOrRight , tickMarks , true /* liveTracking */ ,
+        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
     }


@@ -114,40 +103,52 @@ 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

-    
-    MacPostControlCreate() ;
-    
+
+    if(style & wxSL_LABELS)
+    {
+        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) ;
+

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

+    delete m_macMinimumStatic ;
+    delete m_macMaximumStatic ;
+    delete m_macValueStatic ;

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

-    return GetControl32BitValue( (ControlHandle) m_macControl) ;
+    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( (ControlHandle) m_macControl , 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( (ControlHandle) m_macControl, m_rangeMin);
-    SetControl32BitMaximum( (ControlHandle) m_macControl, 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);


@@ -238,24 +239,52 @@ void wxSlider::Command (wxCommandEvent & event)
     ProcessCommand (event);
 }
 
     ProcessCommand (event);
 }
 

-void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart, bool mouseStillDown )
+{
+    SInt16 value = m_peer->GetValue() ;
+
+    SetValue( value ) ;
+
+    wxEventType scrollEvent = wxEVT_NULL ;
+
+    scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+
+    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 );
+
+    GetEventHandler()->ProcessEvent( cevent );
+}
+
+wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent )

 {
 {

-    SInt16 value = ::GetControl32BitValue( (ControlHandle) m_macControl ) ;
-    
-    SetValue( value ) ;        
-    
-    wxScrollEvent event(wxEVT_SCROLL_THUMBTRACK, m_windowId);
+    SInt16 value = m_peer->GetValue() ;
+
+    SetValue( value ) ;
+
+    wxEventType scrollEvent = wxEVT_NULL ;
+
+    scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
+
+    wxScrollEvent event(scrollEvent, m_windowId);

     event.SetPosition(value);
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent(event);
     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 );

+    return noErr ;

 }
 
 }
 

+

 /* 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,
 /* 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,


@@ -263,7 +292,7 @@ void wxSlider::SetSizeHints( int minW, int minH,
                             int incW , int incH )
 {
     wxSize size = GetBestSize();
                             int incW , int incH )
 {
     wxSize size = GetBestSize();

-    
+

     if(GetWindowStyle() & wxSL_VERTICAL) {
         wxWindow::SetSizeHints(size.x, minH, size.x, maxH, incW, incH);
     }
     if(GetWindowStyle() & wxSL_VERTICAL) {
         wxWindow::SetSizeHints(size.x, minH, size.x, maxH, incW, incH);
     }


@@ -276,12 +305,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);


@@ -294,7 +323,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) {


@@ -324,37 +353,26 @@ wxSize wxSlider::DoGetBestSize() const
     return size;
 }
 
     return size;
 }
 

-void wxSlider::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    wxControl::DoSetSize( x, y , width , height ,sizeFlags ) ;
-}
-
-void wxSlider::MacUpdateDimensions() 
+void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)

 {
 {

-    // actually in the current systems this should never be possible, but later reparenting
-    // may become a reality
-    
-    if ( (ControlHandle) m_macControl == NULL )
-        return ;
-    
-    if ( GetParent() == NULL )
-        return ;
-    
-    WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
-    if ( rootwindow == NULL )
-        return ;
-    

     int  xborder, yborder;
     int  minValWidth, maxValWidth, textwidth, textheight;
     int  sliderBreadth;
     int  xborder, yborder;
     int  minValWidth, maxValWidth, textwidth, textheight;
     int  sliderBreadth;

-    
+

     xborder = yborder = 0;
     xborder = yborder = 0;

-    
+

     if (GetWindowStyle() & wxSL_LABELS)
     {
     if (GetWindowStyle() & wxSL_LABELS)
     {

+        //Labels have this control's parent as their parent
+        //so if this control is not at 0,0 relative to the parent
+        //the labels need to know the position of this control
+        //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);


@@ -364,10 +382,10 @@ void wxSlider::MacUpdateDimensions()
             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;


@@ -375,49 +393,40 @@ void wxSlider::MacUpdateDimensions()
         else {
             sliderBreadth = wxSLIDER_DIMENSIONACROSS_ARROW;
         }
         else {
             sliderBreadth = wxSLIDER_DIMENSIONACROSS_ARROW;
         }

-        
+

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

-            m_macMinimumStatic->Move(sliderBreadth + wxSLIDER_BORDERTEXT,
-                m_height - yborder - textheight);
-            m_macMaximumStatic->Move(sliderBreadth + wxSLIDER_BORDERTEXT, 0);
-            m_macValueStatic->Move(0, m_height - textheight);
+            h = h - yborder ;
+
+            if ( m_macMinimumStatic )
+                m_macMinimumStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT,
+                GetPosition().y + h - yborder);
+            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 );

         }
         else
         {
         }
         else
         {

-            m_macMinimumStatic->Move(0, sliderBreadth + wxSLIDER_BORDERTEXT);
-            m_macMaximumStatic->Move(m_width - xborder - maxValWidth / 2,
-                sliderBreadth + wxSLIDER_BORDERTEXT);
-            m_macValueStatic->Move(m_width - textwidth, 0);
-        }
-    }
-    
-    Rect oldBounds ;       
-    GetControlBounds( (ControlHandle) m_macControl , &oldBounds ) ; 
-    
-    int new_x = m_x + MacGetLeftBorderSize() + m_macHorizontalBorder ;
-    int new_y = m_y + MacGetTopBorderSize() + m_macVerticalBorder ;
-    int new_width = m_width - MacGetLeftBorderSize() - MacGetRightBorderSize() - 2 * m_macHorizontalBorder - xborder ;
-    int new_height = m_height - MacGetTopBorderSize() - MacGetBottomBorderSize() - 2 * m_macVerticalBorder - yborder ;
-    
-    GetParent()->MacWindowToRootWindow( & new_x , & new_y ) ;
-    bool doMove = new_x != oldBounds.left || new_y != oldBounds.top ;
-    bool doResize =  ( oldBounds.right - oldBounds.left ) != new_width || (oldBounds.bottom - oldBounds.top ) != new_height ;
-    if ( doMove || doResize )
-    {
-        InvalWindowRect( rootwindow, &oldBounds ) ;
-        if ( doMove )
-        {
-            UMAMoveControl( (ControlHandle) m_macControl , new_x , new_y ) ;
-        }
-        if ( doResize )
-        {
-            UMASizeControl( (ControlHandle) m_macControl , new_width , new_height ) ;
+            w = w - xborder ;
+            if ( m_macMinimumStatic )
+                m_macMinimumStatic->Move(GetPosition().x + 0, GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
+            if ( m_macMaximumStatic )
+                m_macMaximumStatic->Move(GetPosition().x + w - (maxValWidth/2),
+                GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
+            if ( m_macValueStatic )
+                m_macValueStatic->Move(GetPosition().x + w, GetPosition().y + 0);

         }
     }
         }
     }

+    //If the control has labels, we still need to call this again because
+    //the labels alter the control's w and h values.
+    wxControl::DoSetSize( x, y , w , h ,sizeFlags ) ;
+

 }
 
 void wxSlider::DoMoveWindow(int x, int y, int width, int height)
 {
     wxControl::DoMoveWindow(x,y,width,height) ;
 }
 }
 
 void wxSlider::DoMoveWindow(int x, int y, int width, int height)
 {
     wxControl::DoMoveWindow(x,y,width,height) ;
 }

+
+#endif // wxUSE_SLIDER