X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..b77b87881bae2e6306366d79e7fe160334b3d4a2:/src/mac/gauge.cpp diff --git a/src/mac/gauge.cpp b/src/mac/gauge.cpp index be0d0d0a3c..01a557e17c 100644 --- a/src/mac/gauge.cpp +++ b/src/mac/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__ @@ -15,9 +15,11 @@ #include "wx/gauge.h" +#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) +#endif -#include +#include "wx/mac/uma.h" bool wxGauge::Create(wxWindow *parent, wxWindowID id, int range, @@ -27,26 +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_macHorizontalBorder = 2 ; // additional pixels around the real control - m_macVerticalBorder = 2 ; - - if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y) - { - size = wxSize( 200 , 16 ) ; - } - - MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ; - - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , range, - kControlProgressBarProc , (long) this ) ; - - MacPostControlCreate() ; - - return TRUE; + if ( !wxGaugeBase::Create(parent, id, range, pos, s, style, validator, name) ) + return false; + + 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 , wxEmptyString , 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; } void wxGauge::SetShadowWidth(int w) @@ -60,13 +64,13 @@ void wxGauge::SetBezelFace(int w) 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; - ::SetControlValue( m_macControl , m_gaugePos ) ; + ::SetControl32BitValue( (ControlHandle) m_macControl , m_gaugePos ) ; } int wxGauge::GetShadowWidth() const