implemented MSWGetBgBrush/ColourForChild() to propagate themed notebook background...

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index 19af6c6f41335b01e1b97f092dfbf0c721d186fd..6e9ed032f27f81b6f2784441c3447a22aa29341c 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -15,6 +15,8 @@
 
 #include "wx/gauge.h"
 
 
 #include "wx/gauge.h"
 

+#if wxUSE_GAUGE 
+

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif


@@ -30,66 +32,54 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
     m_macIsUserPane = FALSE ;
            const wxString& name)
 {
     m_macIsUserPane = FALSE ;

-    
+

     if ( !wxGaugeBase::Create(parent, id, range, pos, s, style & 0xE0FFFFFF, validator, name) )
         return false;
 
     wxSize size = s ;
     if ( !wxGaugeBase::Create(parent, id, range, pos, s, style & 0xE0FFFFFF, validator, name) )
         return false;
 
     wxSize size = s ;

-
-    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 ) ;
     }
     {
         size = wxSize( 200 , 16 ) ;
     }

-    
+    */

     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

-    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , range, 
-        kControlProgressBarProc , (long) this ) ;
+    m_peer = new wxMacControl() ;
+    verify_noerr ( CreateProgressBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 
+     GetValue() , 0 , GetRange() , false /* not indeterminate */ , m_peer->GetControlRefAddr() ) );

     
     

+       

     MacPostControlCreate(pos,size) ;
     
     return TRUE;
 }
 
     MacPostControlCreate(pos,size) ;
     
     return TRUE;
 }
 

-void wxGauge::SetShadowWidth(int w)
-{
-}
-
-void wxGauge::SetBezelFace(int w)
-{
-}
-

 void wxGauge::SetRange(int r)
 {
 void wxGauge::SetRange(int r)
 {

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

-    m_gaugePos = pos;
-       ::SetControl32BitValue( (ControlRef) 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
 {
 }
 
 int wxGauge::GetValue() const
 {

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

 }
 
 }
 

+#endif // wxUSE_GAUGE 
+