otherwise we always fall back to blitting, even if we can provide better results

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

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index fd9d5d4e4772b4b9e7f5cde911b1be538d609136..c50ab73d6f5849de0252d347b1bdb784b2284b3a 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -1,19 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        spinbutt.cpp
 // Purpose:     wxSpinButton
 /////////////////////////////////////////////////////////////////////////////
 // Name:        spinbutt.cpp
 // Purpose:     wxSpinButton

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "spinbutt.h"
 #pragma implementation "spinbuttbase.h"
 #endif
 
 #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"
 
 #include "wx/spinbutt.h"
 #include "wx/mac/uma.h"
 


@@ -36,27 +40,30 @@ wxSpinButton::wxSpinButton()
 }
 
 bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
 }
 
 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;
 
     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;
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

 
 

-       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 100, 
-               kControlLittleArrowsProc , (long) this ) ;
-       
-       wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
+    m_peer = new wxMacControl(this) ;
+    verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 ,
+     m_peer->GetControlRefAddr() ) );

 
 

-       MacPostControlCreate() ;
+    m_peer->SetActionProc( GetwxMacLiveScrollbarActionProc() ) ;
+    MacPostControlCreate(pos,size) ;

 
 

-  return TRUE;
+    return true;

 }
 
 wxSpinButton::~wxSpinButton()
 }
 
 wxSpinButton::~wxSpinButton()


@@ -68,54 +75,59 @@ wxSpinButton::~wxSpinButton()
 
 int wxSpinButton::GetMin() const
 {
 
 int wxSpinButton::GetMin() const
 {

-   return m_min;
+    return m_min;

 }
 
 int wxSpinButton::GetMax() const
 {
 }
 
 int wxSpinButton::GetMax() const
 {

-   return m_max;
+    return m_max;

 }
 
 int wxSpinButton::GetValue() const
 {
 }
 
 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)
 {
 }
 
 void wxSpinButton::SetValue(int val)
 {

-       m_value = val ;
+    m_value = val ;

 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {

-       m_min = minVal;
-       m_max = maxVal;
-    SetControlMaximum( (ControlHandle) m_macControl , maxVal ) ;
-    SetControlMinimum((ControlHandle) m_macControl , minVal ) ;
+    m_min = minVal;
+    m_max = maxVal;
+    m_peer->SetMaximum( maxVal ) ;
+    m_peer->SetMinimum( minVal ) ;

 }
 
 void wxSpinButton::MacHandleValueChanged( int inc )
 {
 }
 
 void wxSpinButton::MacHandleValueChanged( int inc )
 {

-     
+

     wxEventType scrollEvent = wxEVT_NULL;
     wxEventType scrollEvent = wxEVT_NULL;

-       int oldValue = m_value ;
+    int oldValue = m_value ;

 
     m_value = oldValue + inc;
 
     if (m_value < m_min)
     {
 
     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_windowStyle & wxSP_WRAP )
+            m_value = m_max;
+        else
+            m_value = m_min;

     }
 
     if (m_value > m_max)
     {
     }
 
     if (m_value > m_max)
     {

-    if ( m_windowStyle & wxSP_WRAP )
-      m_value = m_min;
-    else
-      m_value = m_max;
+        if ( m_windowStyle & wxSP_WRAP )
+            m_value = m_min;
+        else
+            m_value = m_max;

     }
 
     if ( m_value - oldValue == -1 )
     }
 
     if ( m_value - oldValue == -1 )


@@ -124,7 +136,7 @@ void wxSpinButton::MacHandleValueChanged( int inc )
         scrollEvent = wxEVT_SCROLL_LINEUP ;
     else
         scrollEvent = wxEVT_SCROLL_THUMBTRACK ;
         scrollEvent = wxEVT_SCROLL_LINEUP ;
     else
         scrollEvent = wxEVT_SCROLL_THUMBTRACK ;

-        
+

     wxSpinEvent event(scrollEvent, m_windowId);
 
     event.SetPosition(m_value);
     wxSpinEvent event(scrollEvent, m_windowId);
 
     event.SetPosition(m_value);


@@ -134,7 +146,7 @@ void wxSpinButton::MacHandleValueChanged( int inc )
     {
         m_value = oldValue ;
     }
     {
         m_value = oldValue ;
     }

-    SetControlValue( (ControlHandle) m_macControl , m_value ) ;
+    m_peer->SetValue( m_value ) ;

 
     /* always send a thumbtrack event */
     if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)
 
     /* always send a thumbtrack event */
     if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)


@@ -147,24 +159,41 @@ void wxSpinButton::MacHandleValueChanged( int inc )
     }
 }
 
     }
 }
 

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

 {
 {

-       if ( (ControlHandle) m_macControl == NULL )
-               return ;
-       
-  int nScrollInc = 0;
-
-       switch( controlpart )
-       {
-               case kControlUpButtonPart :
-            nScrollInc = 1;
-                       break ;
-               case kControlDownButtonPart :
-            nScrollInc = -1;
-                       break ;
-       }
-       MacHandleValueChanged( nScrollInc ) ;
+    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 ;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -173,6 +202,7 @@ void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart
 
 wxSize wxSpinButton::DoGetBestSize() const
 {
 
 wxSize wxSpinButton::DoGetBestSize() const
 {

-  return wxSize(16,24);
+    return wxSize(16,24);

 }
 
 }
 

+#endif // wxUSE_SPINBTN