made SetDirectory() work, minor code cleanup (much is left to do)

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

diff --git a/src/mac/gauge.cpp b/src/mac/gauge.cpp
index 67d5dd9c845ff2db660fd5d9efcc6d6cb1a65adf..b367d44393e43b6a2f41b4ae19f3c7c713758504 100644 (file)
--- a/src/mac/gauge.cpp
+++ b/src/mac/gauge.cpp
@@ -19,7 +19,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif
 

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"

 
 bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            int range,
 
 bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            int range,


@@ -33,6 +33,7 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
        Rect bounds ;
        Str255 title ;
        m_rangeMax = range ;
        Rect bounds ;
        Str255 title ;
        m_rangeMax = range ;

+       m_gaugePos = 0 ;

        
        if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
        {
        
        if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
        {


@@ -41,7 +42,7 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style & 0xE0FFFFFF /* no borders on mac */ , validator , name , &bounds , title ) ;
 
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style & 0xE0FFFFFF /* no borders on mac */ , validator , name , &bounds , title ) ;
 

-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , range, 
+       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , range, 

                kControlProgressBarProc , (long) this ) ;
        
        MacPostControlCreate() ;
                kControlProgressBarProc , (long) this ) ;
        
        MacPostControlCreate() ;


@@ -60,13 +61,13 @@ void wxGauge::SetBezelFace(int w)
 void wxGauge::SetRange(int r)
 {
     m_rangeMax = r;
 void wxGauge::SetRange(int r)
 {
     m_rangeMax = r;

-    ::SetControlMaximum( m_macControl , m_rangeMax ) ;
+    ::SetControl32BitMaximum( (ControlHandle) m_macControl , m_rangeMax ) ;

 }
 
 void wxGauge::SetValue(int pos)
 {
     m_gaugePos = pos;
 }
 
 void wxGauge::SetValue(int pos)
 {
     m_gaugePos = pos;

-       ::SetControlValue( m_macControl , m_gaugePos ) ;
+       ::SetControl32BitValue( (ControlHandle) m_macControl , m_gaugePos ) ;

 }
 
 int wxGauge::GetShadowWidth() const
 }
 
 int wxGauge::GetShadowWidth() const