support accelerators for buttons too (slightly modified patch 1549012)

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index 6f97b0357833caff02f5efdc843f58bca035c85f..3793d8ed604195d7d9853c474c8bab829f0bcf81 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -9,91 +9,120 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "gauge.h"
-#endif
-
-#include "wx/gauge.h"
+#include "wx/wxprec.h"

 
 #if wxUSE_GAUGE 
 
 
 #if wxUSE_GAUGE 
 

-#if !USE_SHARED_LIBRARY
+#include "wx/gauge.h"
+

 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)

-#endif

 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 

-bool wxGauge::Create(wxWindow *parent, wxWindowID id,
-           int range,
-           const wxPoint& pos,
-           const wxSize& s,
-           long style,
-           const wxValidator& validator,
-           const wxString& name)
+bool wxGauge::Create( wxWindow *parent,
+    wxWindowID id,
+    int range,
+    const wxPoint& pos,
+    const wxSize& s,
+    long style,
+    const wxValidator& validator,
+    const wxString& name )

 {
 {

-    m_macIsUserPane = FALSE ;
+    m_macIsUserPane = false;

 
 

-    if ( !wxGaugeBase::Create(parent, id, range, pos, s, style & 0xE0FFFFFF, validator, name) )
+    if ( !wxGaugeBase::Create( parent, id, range, pos, s, style & 0xE0FFFFFF, validator, name ) )

         return false;
 
         return false;
 

-    wxSize size = s ;
-    /*
-    if ( size.x == wxDefaultCoord && size.y == wxDefaultCoord)
-    {
-        size = wxSize( 200 , 16 ) ;
-    }
-    */
-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    m_peer = new wxMacControl() ;
-    verify_noerr ( CreateProgressBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 
-     GetValue() , 0 , GetRange() , false /* not indeterminate */ , m_peer->GetControlRefAddr() ) );
+    wxSize size = s;
+
+#if 0
+    if (size.x == wxDefaultCoord && size.y == wxDefaultCoord)
+        size = wxSize( 200 , 16 );
+#endif
+
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );
+    m_peer = new wxMacControl( this );
+    OSStatus err = CreateProgressBarControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
+        GetValue(), 0, GetRange(), false /* not indeterminate */, m_peer->GetControlRefAddr() );
+    verify_noerr( err );

 
     if ( GetValue() == 0 )
 
     if ( GetValue() == 0 )

-        m_peer->SetData<Boolean>( kControlEntireControl , kControlProgressBarAnimatingTag , (Boolean) false ) ;
+        m_peer->SetData<Boolean>( kControlEntireControl, kControlProgressBarAnimatingTag, (Boolean)false );

 
 

-    MacPostControlCreate(pos,size) ;
+    MacPostControlCreate( pos, size );

     
     

-    return TRUE;
+    return true;

 }
 
 void wxGauge::SetRange(int r)
 {
     // we are going via the base class in case there is 
     // some change behind the values by it
 }
 
 void wxGauge::SetRange(int r)
 {
     // we are going via the base class in case there is 
     // some change behind the values by it

-    wxGaugeBase::SetRange(r) ;
-    if ( m_peer && m_peer->Ok() )
+    wxGaugeBase::SetRange( r ) ;
+    if ( m_peer && m_peer->Ok() ){
+        // switch back to determinate mode if not there already 
+        if ( m_peer->GetData<Boolean>( kControlNoPart, kControlProgressBarIndeterminateTag ) != false )
+        {
+             m_peer->SetData<Boolean>( kControlNoPart, kControlProgressBarIndeterminateTag, (Boolean)false );
+        }
+    

         m_peer->SetMaximum( GetRange() ) ;
         m_peer->SetMaximum( GetRange() ) ;

+    }

 }
 
 void wxGauge::SetValue(int pos)
 {
     // we are going via the base class in case there is 
     // some change behind the values by it
 }
 
 void wxGauge::SetValue(int pos)
 {
     // we are going via the base class in case there is 
     // some change behind the values by it

-    wxGaugeBase::SetValue(pos) ;
+    wxGaugeBase::SetValue( pos ) ;
+

     if ( m_peer && m_peer->Ok() )
     {
     if ( m_peer && m_peer->Ok() )
     {

+        // switch back to determinate mode if not there already 
+        if ( m_peer->GetData<Boolean>( kControlNoPart, kControlProgressBarIndeterminateTag ) != false )
+        {
+            m_peer->SetData<Boolean>( kControlNoPart, kControlProgressBarIndeterminateTag, (Boolean)false );
+        }
+    

         m_peer->SetValue( GetValue() ) ;
         m_peer->SetValue( GetValue() ) ;

-        // we turn off animation in the unnecessary situations as this is eating a lot of CPU otherwise
+
+        // turn off animation in the unnecessary situations as this is consuming a lot of CPU otherwise

         Boolean shouldAnimate = ( GetValue() > 0 && GetValue() < GetRange() ) ;
         Boolean shouldAnimate = ( GetValue() > 0 && GetValue() < GetRange() ) ;

-        if ( m_peer->GetData<Boolean>( kControlEntireControl , kControlProgressBarAnimatingTag ) != shouldAnimate )
+        if ( m_peer->GetData<Boolean>( kControlEntireControl, kControlProgressBarAnimatingTag ) != shouldAnimate )

         {
         {

-            m_peer->SetData<Boolean>( kControlEntireControl , kControlProgressBarAnimatingTag , shouldAnimate ) ;
+            m_peer->SetData<Boolean>( kControlEntireControl, kControlProgressBarAnimatingTag, shouldAnimate ) ;

             if ( !shouldAnimate )
             if ( !shouldAnimate )

-            {

                 Refresh() ;
                 Refresh() ;

-            }

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

-/*
+#if 0

     if ( m_peer && m_peer->Ok() )
         return m_peer->GetValue() ;
     if ( m_peer && m_peer->Ok() )
         return m_peer->GetValue() ;

-*/
+#endif
+

     return m_gaugePos ;
 }
 
     return m_gaugePos ;
 }
 

-#endif // wxUSE_GAUGE 
+void wxGauge::Pulse()
+{
+    if ( m_peer && m_peer->Ok() )
+    {
+        if ( m_peer->GetData<Boolean>( kControlNoPart, kControlProgressBarIndeterminateTag ) != true )
+        {
+        m_peer->SetData<Boolean>( kControlNoPart, kControlProgressBarIndeterminateTag, true); 
+        }
+        
+        if ( m_peer->GetData<Boolean>( kControlEntireControl, kControlProgressBarAnimatingTag ) != true )
+        {
+            m_peer->SetData<Boolean>( kControlEntireControl, kControlProgressBarAnimatingTag, true ) ;
+        }
+    }
+}
+
+#endif // wxUSE_GAUGE