moved win_gtk.h header to wx/gtk/private, it's for internal use only

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index 9fa85e774696c64a396abb7fb042626736b6debb..3793d8ed604195d7d9853c474c8bab829f0bcf81 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -60,8 +60,15 @@ 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 ) ;
     // 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() ) ;
         m_peer->SetMaximum( GetRange() ) ;

+    }

 }
 
 void wxGauge::SetValue(int pos)
 }
 
 void wxGauge::SetValue(int pos)


@@ -72,6 +79,12 @@ void wxGauge::SetValue(int 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() ) ;
 
         // turn off animation in the unnecessary situations as this is consuming a lot of CPU otherwise
         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 ;
 }
 
     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
 
 #endif // wxUSE_GAUGE