popup activation scope and l&f

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index 9fa85e774696c64a396abb7fb042626736b6debb..b2f36abe9574f69147b0b54f7f9c048ade46d667 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -11,7 +11,7 @@
 
 #include "wx/wxprec.h"
 
-#if wxUSE_GAUGE 
+#if wxUSE_GAUGE
 
 #include "wx/gauge.h"
 
@@ -51,27 +51,40 @@ bool wxGauge::Create( wxWindow *parent,
         m_peer->SetData<Boolean>( kControlEntireControl, kControlProgressBarAnimatingTag, (Boolean)false );
 
     MacPostControlCreate( pos, size );
-    
+
     return true;
 }
 
 void wxGauge::SetRange(int r)
 {
-    // we are going via the base class in case there is 
+    // 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() )
+    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() ) ;
+    }
 }
 
 void wxGauge::SetValue(int pos)
 {
-    // we are going via the base class in case there is 
+    // we are going via the base class in case there is
     // some change behind the values by it
     wxGaugeBase::SetValue( pos ) ;
 
     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() ) ;
 
         // turn off animation in the unnecessary situations as this is consuming a lot of CPU otherwise
@@ -95,5 +108,21 @@ int wxGauge::GetValue() const
     return m_gaugePos ;
 }
 
+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