X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/571b0b138bc5c910e4dbc5bca510b65859741e1b..bb996f289574defb0ae4339ae8e46ff3cf6fa54c:/src/cocoa/gauge.mm diff --git a/src/cocoa/gauge.mm b/src/cocoa/gauge.mm index 3405ae7db5..c2a48305f7 100644 --- a/src/cocoa/gauge.mm +++ b/src/cocoa/gauge.mm @@ -1,20 +1,22 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/gauge.mm +// Name: src/cocoa/gauge.mm // Purpose: wxGauge // Author: David Elliott // Modified by: // Created: 2003/07/15 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + #if wxUSE_GAUGE +#include "wx/gauge.h" + #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/gauge.h" #include "wx/log.h" #endif //WX_PRECOMP @@ -25,7 +27,6 @@ #include -IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) BEGIN_EVENT_TABLE(wxGauge, wxGaugeBase) END_EVENT_TABLE() // WX_IMPLEMENT_COCOA_OWNER(wxGauge,NSProgressIndicator,NSView,NSView) @@ -34,17 +35,20 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID winid, int range, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) { - //flag checking - wxASSERT_MSG( !(style & wxGA_HORIZONTAL), wxT("Horizontal gauge not supported on cocoa"));//* - wxASSERT_MSG( !(style & wxGA_SMOOTH), wxT("Smooth gauge not supported on cocoa")); - //* - GNUStep made isVertical and setVertical part of thier framework, but its specific to them - //the way they do it is just handle that flag in drawRect. - + // NOTE: wxGA_SMOOTH flag is simply ignored (gauges are ALWAYS smooth) if(!CreateControl(parent,winid,pos,size,style,validator,name)) return false; SetNSView([[NSProgressIndicator alloc] initWithFrame: MakeDefaultNSRect(size)]); [m_cocoaNSView release]; + // TODO: DoGetBestSize is likely totally wrong for vertical gauges but + // this actually makes the widgets sample work so it's better than nothing. + if(style & wxGA_VERTICAL) + { + wxLogDebug(wxT("wxGA_VERTICAL may not work correctly. See src/cocoa/gauge.mm")); + [m_cocoaNSView setBoundsRotation:-90.0]; + } + [(NSProgressIndicator*)m_cocoaNSView setMaxValue:range]; [(NSProgressIndicator*)m_cocoaNSView setIndeterminate:NO]; @@ -97,7 +101,7 @@ NS_ENDHANDLER if(didFit) { NSRect cocoaRect = [m_cocoaNSView frame]; - wxSize size((int)ceilf(cocoaRect.size.width),(int)ceilf(cocoaRect.size.height)); + wxSize size((int)ceil(cocoaRect.size.width),(int)ceil(cocoaRect.size.height)); [m_cocoaNSView setFrame: storedRect]; wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxControl=%p::DoGetBestSize()==(%d,%d) from sizeToFit"),this,size.x,size.y); return /*wxConstCast(this, wxControl)->m_bestSize =*/ size;