made GetColourFromGTKWidget() more general, it is now used for all colours

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index a85fbc498ffacbc22cc601acc40b6835be0ffb0a..fe19204a45b3ab89a607246e7cc8a6c75d33d795 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -19,67 +19,63 @@
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif
 
 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
+       wxSize size = s ;
+       Rect bounds ;
+       Str255 title ;
+       m_rangeMax = range ;
+       
+       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 = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , range, 
+               kControlProgressBarProc , (long) this ) ;
+       
+       MacPostControlCreate() ;
+
+  return TRUE;

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

-    // TODO optional

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

-    // TODO optional

 }
 
 void wxGauge::SetRange(int r)
 {
     m_rangeMax = r;
 }
 
 void wxGauge::SetRange(int r)
 {
     m_rangeMax = r;

-    // TODO
+    ::SetControlMaximum( m_macControl , m_rangeMax ) ;

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

-    // TODO
+       ::SetControlValue( m_macControl , m_gaugePos ) ;

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

-    // TODO optional

     return 0;
 }
 
 int wxGauge::GetBezelFace() const
 {
     return 0;
 }
 
 int wxGauge::GetBezelFace() const
 {

-    // TODO optional

     return 0;
 }
 
     return 0;
 }