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 3bfb3e2439460e9d47cc920fcb4014361270a0c1..b2f36abe9574f69147b0b54f7f9c048ade46d667 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -9,13 +9,9 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "gauge.h"
-#endif
-
 #include "wx/wxprec.h"
 
-#if wxUSE_GAUGE 
+#if wxUSE_GAUGE
 
 #include "wx/gauge.h"
 
@@ -23,77 +19,110 @@ IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 
 #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;
 
-    wxSize size = s ;
-    /*
-    if ( size.x == wxDefaultCoord && size.y == wxDefaultCoord)
-    {
-        size = wxSize( 200 , 16 ) ;
-    }
-    */
-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    m_peer = new wxMacControl(this) ;
-    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 )
-        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 
+    // 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() ) ;
+    }
 }
 
 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) ;
+    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() ) ;
-        // 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() ) ;
-        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 )
-            {
                 Refresh() ;
-            }
         }
     }
 }
 
 int wxGauge::GetValue() const
 {
-/*
+#if 0
     if ( m_peer && m_peer->Ok() )
         return m_peer->GetValue() ;
-*/
+#endif
+
     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