X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72d750d4620a438af0c0233712622af2e28bad1d..78606adf3a792c767d6498882e81547990180c96:/src/mac/carbon/spinbutt.cpp

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index 4003a1a388..2b900c19fd 100644
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -1,18 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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__
-#pragma implementation "spinbutt.h"
-#pragma implementation "spinbuttbase.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_SPINBTN
 
 #include "wx/spinbutt.h"
 #include "wx/mac/uma.h"
@@ -25,10 +24,8 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
 
 wxSpinButton::wxSpinButton()
    : wxSpinButtonBase()
@@ -36,27 +33,30 @@ wxSpinButton::wxSpinButton()
 }
 
 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 ) ;
+    if (!parent)
+        return false;
 
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 100, 
-		kControlLittleArrowsProc , (long) this ) ;
-	
-	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
 
-	MacPostControlCreate() ;
+    m_peer = new wxMacControl(this) ;
+    verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 ,
+     m_peer->GetControlRefAddr() ) );
 
-  return TRUE;
+    m_peer->SetActionProc( GetwxMacLiveScrollbarActionProc() ) ;
+    MacPostControlCreate(pos,size) ;
+
+    return true;
 }
 
 wxSpinButton::~wxSpinButton()
@@ -68,86 +68,78 @@ 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
 {
-    return m_value;
+    int n = m_value;
+
+    if (n < m_min) n = m_min;
+    if (n > m_max) n = m_max;
+
+    return n;
 }
 
 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;
-    SetControlMaximum( m_macControl , maxVal ) ;
-    SetControlMinimum(  m_macControl , minVal ) ;
+    m_min = minVal;
+    m_max = maxVal;
+    m_peer->SetMaximum( maxVal ) ;
+    m_peer->SetMinimum( minVal ) ;
 }
 
-void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxSpinButton::MacHandleValueChanged( int inc )
 {
-	if ( m_macControl == NULL )
-		return ;
-	
-	int oldValue = m_value ;
-  wxEventType scrollEvent = wxEVT_NULL;
-  int nScrollInc = 0;
-
-	switch( controlpart )
-	{
-		case kControlUpButtonPart :
-        nScrollInc = 1;
-        scrollEvent = wxEVT_SCROLL_LINEUP;
-			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;
+
+    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
-      m_value = m_max;
-  }
-  	
-  wxSpinEvent event(scrollEvent, m_windowId);
-
-  event.SetPosition(m_value);
-  event.SetEventObject( this );
-  if ((GetEventHandler()->ProcessEvent( event )) &&
+        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 ;
-  }
-  SetControlValue(  m_macControl , m_value ) ;
+    {
+        m_value = oldValue ;
+    }
+    m_peer->SetValue( m_value ) ;
 
     /* always send a thumbtrack event */
     if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)
@@ -160,23 +152,50 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
     }
 }
 
+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 ) ;
+}
+
+wxInt32 wxSpinButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )
+{
+    /*
+    // 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;
+        break ;
+    case kControlDownButtonPart :
+        nScrollInc = -1;
+        break ;
+    }
+    MacHandleValueChanged( nScrollInc ) ;
+    */
+    return noErr ;
+}
+
 // ----------------------------------------------------------------------------
 // size calculation
 // ----------------------------------------------------------------------------
 
 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);
 }
 
+#endif // wxUSE_SPINBTN