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 8dadaff83fa6a3683debfe3c818db7edf010d087..3bfb3e2439460e9d47cc920fcb4014361270a0c1 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -9,17 +9,17 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "gauge.h"
 #endif
 
-#include "wx/gauge.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_GAUGE 
 
-#if !USE_SHARED_LIBRARY
+#include "wx/gauge.h"
+
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-#endif
 
 #include "wx/mac/uma.h"
 
@@ -44,7 +44,7 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
     }
     */
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl(this) ;
     verify_noerr ( CreateProgressBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 
      GetValue() , 0 , GetRange() , false /* not indeterminate */ , m_peer->GetControlRefAddr() ) );
 
@@ -73,6 +73,7 @@ void wxGauge::SetValue(int 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 )
         {