From: David Elliott Date: Sat, 28 May 2005 02:17:04 +0000 (+0000) Subject: Removed bogus assert for wxGA_SMOOTH. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f22c3fa8562fcfe5c8049891550f8452579b090f Removed bogus assert for wxGA_SMOOTH. Implemented vertical gauge (sort of). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/cocoa/gauge.mm b/src/cocoa/gauge.mm index 08b164e419..73e1dff6bf 100644 --- a/src/cocoa/gauge.mm +++ b/src/cocoa/gauge.mm @@ -34,17 +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) { - //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("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];