BU_EXACTFIT adapted

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

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index fc9954f9e5eb71304132012057d9321150ebddbb..526eaacd7bb71a43bcbd9adb68819c882b74a18c 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        spinbutt.cpp
 // Purpose:     wxSpinButton
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -27,38 +27,43 @@
 
 #if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
+    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
 #endif
 
+extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
+
 wxSpinButton::wxSpinButton()
    : wxSpinButtonBase()
 {
 }
 
 bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-            long style, const wxString& name)
+        long style, const wxString& name)
 {
+    m_macIsUserPane = FALSE ;
+    
+    if ( !wxSpinButtonBase::Create(parent, id, pos, size,
+                                   style, wxDefaultValidator, name) )
+        return false;
+
     m_min = 0;
     m_max = 100;
-
-  if (!parent)
-      return FALSE;
     
-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  "" , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 100, 
-               kControlLittleArrowsProc , (long) this ) ;
-       
-       wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
-
-       MacPostControlCreate() ;
-
-  return TRUE;
+    if (!parent)
+        return FALSE;
+    
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+        
+    m_peer = new wxMacControl() ;
+    verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 ,
+     *m_peer ) );
+    
+    SetControlAction( *m_peer , wxMacLiveScrollbarActionUPP ) ;
+    MacPostControlCreate(pos,size) ;
+    
+    return TRUE;
 }
-
+    
 wxSpinButton::~wxSpinButton()
 {
 }
@@ -68,12 +73,12 @@ wxSpinButton::~wxSpinButton()
 
 int wxSpinButton::GetMin() const
 {
-   return m_min;
+    return m_min;
 }
 
 int wxSpinButton::GetMax() const
 {
-   return m_max;
+    return m_max;
 }
 
 int wxSpinButton::GetValue() const
@@ -83,63 +88,105 @@ int wxSpinButton::GetValue() const
 
 void wxSpinButton::SetValue(int val)
 {
-       m_value = val ;
-  wxScrollEvent event(wxEVT_SCROLL_THUMBTRACK, m_windowId);
-
-  event.SetPosition(m_value);
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
+    m_value = val ;
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
-       m_min = minVal;
-       m_max = maxVal;
+    m_min = minVal;
+    m_max = maxVal;
+    SetControl32BitMaximum( *m_peer , maxVal ) ;
+    SetControl32BitMinimum(*m_peer , minVal ) ;
+}
+
+void wxSpinButton::MacHandleValueChanged( int inc )
+{
+    
+    wxEventType scrollEvent = wxEVT_NULL;
+    int oldValue = m_value ;
+    
+    m_value = oldValue + inc;
+    
+    if (m_value < m_min)
+    {
+        if ( m_windowStyle & wxSP_WRAP )
+            m_value = m_max;
+        else
+            m_value = m_min;
+    }
+    
+    if (m_value > m_max)
+    {
+        if ( m_windowStyle & wxSP_WRAP )
+            m_value = m_min;
+        else
+            m_value = m_max;
+    }
+    
+    if ( m_value - oldValue == -1 )
+        scrollEvent = wxEVT_SCROLL_LINEDOWN ;
+    else if ( m_value - oldValue == 1 )
+        scrollEvent = wxEVT_SCROLL_LINEUP ;
+    else
+        scrollEvent = wxEVT_SCROLL_THUMBTRACK ;
+    
+    wxSpinEvent event(scrollEvent, m_windowId);
+    
+    event.SetPosition(m_value);
+    event.SetEventObject( this );
+    if ((GetEventHandler()->ProcessEvent( event )) &&
+        !event.IsAllowed() )
+    {
+        m_value = oldValue ;
+    }
+    SetControl32BitValue( *m_peer , m_value ) ;
+    
+    /* always send a thumbtrack event */
+    if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)
+    {
+        scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+        wxSpinEvent event2( scrollEvent, GetId());
+        event2.SetPosition( m_value );
+        event2.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( event2 );
+    }
+}
+
+void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) 
+{
+    int nScrollInc = 0;
+    
+    switch( controlpart )
+    {
+    case kControlUpButtonPart :
+        nScrollInc = 1;
+        break ;
+    case kControlDownButtonPart :
+        nScrollInc = -1;
+        break ;
+    }
+    MacHandleValueChanged( nScrollInc ) ;
 }
 
-void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+wxInt32 wxSpinButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )  
 {
-       if ( m_macControl == NULL )
-               return ;
-       
-  wxEventType scrollEvent = wxEVT_NULL;
-  int nScrollInc = 0;
-
-       switch( controlpart )
-       {
-               case kControlUpButtonPart :
+    /*
+    // these have been handled by the live action proc already
+    int nScrollInc = 0;
+    wxMacCarbonEvent cEvent( (EventRef) event ) ;
+    
+    switch( cEvent.GetParameter<ControlPartCode>(kEventParamControlPart,typeControlPartCode) )
+    {
+    case kControlUpButtonPart :
         nScrollInc = 1;
-        scrollEvent = wxEVT_SCROLL_LINEUP;
-                       break ;
-               case kControlDownButtonPart :
+        break ;
+    case kControlDownButtonPart :
         nScrollInc = -1;
-        scrollEvent = wxEVT_SCROLL_LINEDOWN;
-                       break ;
-       }
-
-  m_value = m_value + nScrollInc;
-
-  if (m_value < m_min)
-  {
-       if ( m_windowStyle & wxSP_WRAP )
-      m_value = m_max;
-       else
-      m_value = m_min;
-  }
-  
-  if (m_value > m_max)
-  {
-       if ( m_windowStyle & wxSP_WRAP )
-      m_value = m_min;
-    else
-      m_value = m_max;
-  }
-       
-  wxScrollEvent event(scrollEvent, m_windowId);
-
-  event.SetPosition(m_value);
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
+        break ;
+    }
+    MacHandleValueChanged( nScrollInc ) ;
+    */
+    return noErr ;
 }
 
 // ----------------------------------------------------------------------------
@@ -148,17 +195,6 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
 
 wxSize wxSpinButton::DoGetBestSize() const
 {
-    if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
-    {
-        // vertical control
-        return wxSize(16,
-                      2*16);
-    }
-    else
-    {
-        // horizontal control
-        return wxSize(2*16,
-                      16);
-    }
+    return wxSize(16,24);
 }