replacing OSX only carbon calls by classic ones for CFM build

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index b367d44393e43b6a2f41b4ae19f3c7c713758504..36abf248dce06f070f3e0bd00b6a83d9a43fc1fc 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gauge.cpp
 // Purpose:     wxGauge class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -29,25 +29,28 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
-       wxSize size = s ;
-       Rect bounds ;
-       Str255 title ;
-       m_rangeMax = range ;
-       m_gaugePos = 0 ;
-       
-       if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
-       {
-               size = wxSize( 200 , 16 ) ;
-       }
-       
-       MacPreControlCreate( parent , id ,  "" , 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() ;
-
-  return TRUE;
+    m_macIsUserPane = FALSE ;
+    
+    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)
+    {
+        size = wxSize( 200 , 16 ) ;
+    }
+    
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    verify_noerr ( CreateProgressBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 
+     m_gaugePos , 0 , m_rangeMax , false /* not indeterminate */ , (ControlRef*) &m_macControl ) ) ;
+       
+    MacPostControlCreate(pos,size) ;
+    
+    return TRUE;
 }
 
 void wxGauge::SetShadowWidth(int w)
@@ -61,13 +64,13 @@ void wxGauge::SetBezelFace(int w)
 void wxGauge::SetRange(int r)
 {
     m_rangeMax = r;
-    ::SetControl32BitMaximum( (ControlHandle) m_macControl , m_rangeMax ) ;
+    ::SetControl32BitMaximum( (ControlRef) m_macControl , m_rangeMax ) ;
 }
 
 void wxGauge::SetValue(int pos)
 {
     m_gaugePos = pos;
-       ::SetControl32BitValue( (ControlHandle) m_macControl , m_gaugePos ) ;
+       ::SetControl32BitValue( (ControlRef) m_macControl , m_gaugePos ) ;
 }
 
 int wxGauge::GetShadowWidth() const