X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15bc1a64a82f79768174325ae05f4ef4f68f8469..27c78e4552aaefac9a4db0d4453eff09cdfef2ad:/src/cocoa/gauge.mm diff --git a/src/cocoa/gauge.mm b/src/cocoa/gauge.mm index 92978f94bd..7feb27ef6d 100644 --- a/src/cocoa/gauge.mm +++ b/src/cocoa/gauge.mm @@ -6,7 +6,7 @@ // Created: 2003/07/15 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -34,11 +34,20 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID winid, int range, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) { + // 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]; @@ -91,7 +100,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;