Clean up indentation / tabs from previous patch

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index a85fbc498ffacbc22cc601acc40b6835be0ffb0a..1970134e2f28440b72dd6b0af58b0a8bde27d0c2 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -1,95 +1,101 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gauge.cpp
 // Purpose:     wxGauge class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gauge.cpp
 // Purpose:     wxGauge class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // 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
 
 #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/gauge.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif
 

+#include "wx/mac/uma.h"
+

 bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            int range,
            const wxPoint& pos,
 bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            int range,
            const wxPoint& pos,

-           const wxSize& size,
+           const wxSize& s,

            long style,
            const wxValidator& validator,
            const wxString& name)
 {
            long style,
            const wxValidator& validator,
            const wxString& name)
 {

-    SetName(name);
-    SetValidator(validator);
-    m_rangeMax = range;
-    m_windowStyle = style;
-
-    if (parent) parent->AddChild(this);
-
-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
-    else
-           m_windowId = id;
-
-
-    // TODO
-    return FALSE;
-}
-
-void wxGauge::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // TODO
-}
-
-void wxGauge::SetShadowWidth(int w)
-{
-    // TODO optional
-}
-
-void wxGauge::SetBezelFace(int w)
-{
-    // TODO optional
+    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() ;
+    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)
 {
 }
 
 void wxGauge::SetRange(int r)
 {

-    m_rangeMax = r;
-    // TODO
+    // 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)
 {
 }
 
 void wxGauge::SetValue(int pos)
 {

-    m_gaugePos = pos;
-    // TODO
-}
-
-int wxGauge::GetShadowWidth() const
-{
-    // TODO optional
-    return 0;
-}
-
-int wxGauge::GetBezelFace() const
-{
-    // TODO optional
-    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
 {
 }
 
 int wxGauge::GetValue() const
 {

-    return m_gaugePos;
+/*
+    if ( m_peer && m_peer->Ok() )
+        return m_peer->GetValue() ;
+*/
+    return m_gaugePos ;

 }
 
 }
 

+#endif // wxUSE_GAUGE 
+