use wxString::Format(), calling string.Format() has no effect patch 1267345)

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index adc511023617b4e2ba29c29ae8fe24114288d15a..3bfb3e2439460e9d47cc920fcb4014361270a0c1 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -1,23 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gauge.cpp
 // Purpose:     wxGauge class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "gauge.h"
 #endif
 
+#include "wx/wxprec.h"
+
+#if wxUSE_GAUGE 
+
 #include "wx/gauge.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-#endif
 
 #include "wx/mac/uma.h"
 
@@ -29,64 +31,69 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
-       wxSize size = s ;
-       Rect bounds ;
-       Str255 title ;
-       m_rangeMax = range ;
-       m_gaugePos = 0 ;
-       
-       if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
-       {
-               size = wxSize( 200 , 16 ) ;
-       }
-       
-       MacPreControlCreate( parent , id ,  "" , pos , size ,style & 0xE0FFFFFF /* no borders on mac */ , validator , name , &bounds , title ) ;
-
-       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , range, 
-               kControlProgressBarProc , (long) this ) ;
-       
-       MacPostControlCreate() ;
-
-  return TRUE;
-}
-
-void wxGauge::SetShadowWidth(int w)
-{
-}
-
-void wxGauge::SetBezelFace(int w)
-{
+    m_macIsUserPane = FALSE ;
+
+    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() ) );
+
+    if ( GetValue() == 0 )
+        m_peer->SetData<Boolean>( kControlEntireControl , kControlProgressBarAnimatingTag , (Boolean) false ) ;
+
+    MacPostControlCreate(pos,size) ;
+    
+    return TRUE;
 }
 
 void wxGauge::SetRange(int r)
 {
-    m_rangeMax = r;
-    ::SetControlMaximum( (ControlHandle) m_macControl , m_rangeMax ) ;
+    // 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() )
+        m_peer->SetMaximum( GetRange() ) ;
 }
 
 void wxGauge::SetValue(int pos)
 {
-    m_gaugePos = pos;
-       ::SetControlValue( (ControlHandle) m_macControl , m_gaugePos ) ;
-}
-
-int wxGauge::GetShadowWidth() const
-{
-    return 0;
-}
-
-int wxGauge::GetBezelFace() const
-{
-    return 0;
-}
-
-int wxGauge::GetRange() const
-{
-    return m_rangeMax;
+    // 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() )
+    {
+        m_peer->SetValue( GetValue() ) ;
+        // we turn off animation in the unnecessary situations as this is eating a lot of CPU otherwise
+        Boolean shouldAnimate = ( GetValue() > 0 && GetValue() < GetRange() ) ;
+        if ( m_peer->GetData<Boolean>( kControlEntireControl , kControlProgressBarAnimatingTag ) != shouldAnimate )
+        {
+            m_peer->SetData<Boolean>( kControlEntireControl , kControlProgressBarAnimatingTag , shouldAnimate ) ;
+            if ( !shouldAnimate )
+            {
+                Refresh() ;
+            }
+        }
+    }
 }
 
 int wxGauge::GetValue() const
 {
-    return m_gaugePos;
+/*
+    if ( m_peer && m_peer->Ok() )
+        return m_peer->GetValue() ;
+*/
+    return m_gaugePos ;
 }
 
+#endif // wxUSE_GAUGE 
+