Fix bug with m_current causing EVT_LIST_KEY_DOWN events not to fire in virtual mode...

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

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index 98272dc92a3a5d67841a1be83321332f34a6430b..55de645d54390cfada5f3f070d763e14352b052e 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -9,68 +9,56 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 
 #include "wx/spinbutt.h"
 #include "wx/mac/uma.h"
 

-// ============================================================================
-// implementation
-// ============================================================================

 
 

-// ----------------------------------------------------------------------------
-// wxWin macros
-// ----------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)

 
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
-#endif
-
-extern ControlActionUPP wxMacLiveScrollbarActionUPP ;

 
 wxSpinButton::wxSpinButton()
    : wxSpinButtonBase()
 {
 }
 
 
 wxSpinButton::wxSpinButton()
    : wxSpinButtonBase()
 {
 }
 

-bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-        long style, const wxString& name)
+bool wxSpinButton::Create( wxWindow *parent,
+    wxWindowID id, const wxPoint& pos, const wxSize& size,
+    long style, const wxString& name )

 {
 {

-    m_macIsUserPane = FALSE ;
-    
-    if ( !wxSpinButtonBase::Create(parent, id, pos, size,
-                                   style, wxDefaultValidator, name) )
+    m_macIsUserPane = false;
+
+    if ( !wxSpinButtonBase::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )

         return false;
 
     m_min = 0;
     m_max = 100;
         return false;
 
     m_min = 0;
     m_max = 100;

-    
+

     if (!parent)
     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->GetControlRefAddr() ) );
-    
-    m_peer->SetActionProc( wxMacLiveScrollbarActionUPP ) ;
-    MacPostControlCreate(pos,size) ;
-    
-    return TRUE;
+        return false;
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size );
+
+    m_peer = new wxMacControl( this );
+    OSStatus err = CreateLittleArrowsControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, 0, m_min, m_max, 1,
+        m_peer->GetControlRefAddr() );
+    verify_noerr( err );
+
+    m_peer->SetActionProc( GetwxMacLiveScrollbarActionProc() );
+    MacPostControlCreate( pos, size );
+
+    return true;

 }
 }

-    
+

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

-// Attributes
-////////////////////////////////////////////////////////////////////////////
-

 int wxSpinButton::GetMin() const
 {
     return m_min;
 int wxSpinButton::GetMin() const
 {
     return m_min;


@@ -83,30 +71,36 @@ int wxSpinButton::GetMax() const
 
 int wxSpinButton::GetValue() const
 {
 
 int wxSpinButton::GetValue() const
 {

-    return m_value;
+    int n = m_value;
+
+    if (n < m_min)
+        n = m_min;
+    else 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)
 {
     m_min = minVal;
     m_max = maxVal;
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
     m_min = minVal;
     m_max = maxVal;

-    m_peer->SetMaximum( maxVal ) ;
-    m_peer->SetMinimum( minVal ) ;
+    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;
     m_value = oldValue + inc;

-    
+

     if (m_value < m_min)
     {
         if ( m_windowStyle & wxSP_WRAP )
     if (m_value < m_min)
     {
         if ( m_windowStyle & wxSP_WRAP )


@@ -114,7 +108,7 @@ void wxSpinButton::MacHandleValueChanged( int inc )
         else
             m_value = m_min;
     }
         else
             m_value = m_min;
     }

-    
+

     if (m_value > m_max)
     {
         if ( m_windowStyle & wxSP_WRAP )
     if (m_value > m_max)
     {
         if ( m_windowStyle & wxSP_WRAP )


@@ -122,79 +116,90 @@ void wxSpinButton::MacHandleValueChanged( int inc )
         else
             m_value = m_max;
     }
         else
             m_value = m_max;
     }

-    
+

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

-        scrollEvent = wxEVT_SCROLL_LINEDOWN ;
+        scrollEvent = wxEVT_SCROLL_LINEDOWN;

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

-        scrollEvent = wxEVT_SCROLL_LINEUP ;
+        scrollEvent = wxEVT_SCROLL_LINEUP;

     else
     else

-        scrollEvent = wxEVT_SCROLL_THUMBTRACK ;
-    
-    wxSpinEvent event(scrollEvent, m_windowId);
-    
-    event.SetPosition(m_value);
+        scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+
+    // Do not send an event if the value has not actually changed
+    // (Also works for wxSpinCtrl)
+    if ( m_value == oldValue )
+        return;
+
+    wxSpinEvent event( scrollEvent, m_windowId );
+
+    event.SetPosition( m_value );

     event.SetEventObject( this );
     event.SetEventObject( this );

-    if ((GetEventHandler()->ProcessEvent( event )) &&
-        !event.IsAllowed() )
-    {
-        m_value = oldValue ;
-    }
-    m_peer->SetValue( m_value ) ;
-    
-    /* always send a thumbtrack event */
+    if ((GetEventHandler()->ProcessEvent( event )) && !event.IsAllowed())
+        m_value = oldValue;
+
+    m_peer->SetValue( m_value );
+
+    // always send a thumbtrack event

     if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)
     {
         scrollEvent = wxEVT_SCROLL_THUMBTRACK;
     if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)
     {
         scrollEvent = wxEVT_SCROLL_THUMBTRACK;

-        wxSpinEvent event2( scrollEvent, GetId());
+        wxSpinEvent event2( scrollEvent, GetId() );

         event2.SetPosition( m_value );
         event2.SetEventObject( this );
         GetEventHandler()->ProcessEvent( event2 );
     }
 }
 
         event2.SetPosition( m_value );
         event2.SetEventObject( this );
         GetEventHandler()->ProcessEvent( event2 );
     }
 }
 

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

 {
     int nScrollInc = 0;
 {
     int nScrollInc = 0;

-    
-    switch( controlpart )
+
+    switch ( controlpart )

     {
     case kControlUpButtonPart :
         nScrollInc = 1;
     {
     case kControlUpButtonPart :
         nScrollInc = 1;

-        break ;
+        break;
+

     case kControlDownButtonPart :
         nScrollInc = -1;
     case kControlDownButtonPart :
         nScrollInc = -1;

-        break ;
+        break;
+
+    default:
+        break;

     }
     }

+

     MacHandleValueChanged( nScrollInc ) ;
 }
 
     MacHandleValueChanged( nScrollInc ) ;
 }
 

-wxInt32 wxSpinButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )  
+wxInt32 wxSpinButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )

 {
 {

-    /*
+#if 0

     // these have been handled by the live action proc already
     int nScrollInc = 0;
     // these have been handled by the live action proc already
     int nScrollInc = 0;

-    wxMacCarbonEvent cEvent( (EventRef) event ) ;
-    
-    switch( cEvent.GetParameter<ControlPartCode>(kEventParamControlPart,typeControlPartCode) )
+    wxMacCarbonEvent cEvent( (EventRef)event );
+
+    switch ( cEvent.GetParameter<ControlPartCode>(kEventParamControlPart, typeControlPartCode) )

     {
     case kControlUpButtonPart :
         nScrollInc = 1;
     {
     case kControlUpButtonPart :
         nScrollInc = 1;

-        break ;
+        break;
+

     case kControlDownButtonPart :
         nScrollInc = -1;
     case kControlDownButtonPart :
         nScrollInc = -1;

-        break ;
+        break;
+
+    default :
+        break;

     }
     }

+

     MacHandleValueChanged( nScrollInc ) ;
     MacHandleValueChanged( nScrollInc ) ;

-    */
-    return noErr ;
-}
+#endif

 
 

-// ----------------------------------------------------------------------------
-// size calculation
-// ----------------------------------------------------------------------------
+    return noErr;
+}

 
 wxSize wxSpinButton::DoGetBestSize() const
 {
 
 wxSize wxSpinButton::DoGetBestSize() const
 {

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

 }
 
 }
 

+#endif // wxUSE_SPINBTN