X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/427ff66291af2d8dd34ff5ee68c81436997144a1..c4a95f6f991fa8685625831e52dc021b89727529:/src/mac/carbon/gauge.cpp

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index de7dd8c90c..6e9ed032f2 100644
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -15,6 +15,8 @@
 
 #include "wx/gauge.h"
 
+#if wxUSE_GAUGE 
+
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif
@@ -29,64 +31,55 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
+    m_macIsUserPane = FALSE ;
+
+    if ( !wxGaugeBase::Create(parent, id, range, pos, s, style & 0xE0FFFFFF, validator, name) )
+        return false;
+
     wxSize size = s ;
-    Rect bounds ;
-    Str255 title ;
-    m_rangeMax = range ;
-    m_gaugePos = 0 ;
-    
-    if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
+    /*
+    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() ) );
     
-    MacPreControlCreate( parent , id ,  wxEmptyString , 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() ;
+       
+    MacPostControlCreate(pos,size) ;
     
     return TRUE;
 }
 
-void wxGauge::SetShadowWidth(int w)
-{
-}
-
-void wxGauge::SetBezelFace(int w)
-{
-}
-
 void wxGauge::SetRange(int r)
 {
-    m_rangeMax = r;
-    ::SetControl32BitMaximum( (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;
-       ::SetControl32BitValue( (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() ) ;
 }
 
 int wxGauge::GetValue() const
 {
-    return m_gaugePos;
+/*
+    if ( m_peer && m_peer->Ok() )
+        return m_peer->GetValue() ;
+*/
+    return m_gaugePos ;
 }
 
+#endif // wxUSE_GAUGE 
+