X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..10d3680f1aa82bb7b3a206b07de9592cc147e9dc:/src/mac/gauge.cpp diff --git a/src/mac/gauge.cpp b/src/mac/gauge.cpp index a85fbc498f..67d5dd9c84 100644 --- a/src/mac/gauge.cpp +++ b/src/mac/gauge.cpp @@ -19,67 +19,63 @@ IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) #endif +#include + 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) { - 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 , true , 0 , 0 , range, + kControlProgressBarProc , (long) this ) ; + + MacPostControlCreate() ; + + return TRUE; } void wxGauge::SetShadowWidth(int w) { - // TODO optional } void wxGauge::SetBezelFace(int w) { - // TODO optional } void wxGauge::SetRange(int r) { m_rangeMax = r; - // TODO + ::SetControlMaximum( m_macControl , m_rangeMax ) ; } void wxGauge::SetValue(int pos) { m_gaugePos = pos; - // TODO + ::SetControlValue( m_macControl , m_gaugePos ) ; } int wxGauge::GetShadowWidth() const { - // TODO optional return 0; } int wxGauge::GetBezelFace() const { - // TODO optional return 0; }