Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed bogus assert for wxGA_SMOOTH.

Browse Source 
Implemented vertical gauge (sort of).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2005-05-28 02:17:04 +00:00
parent 6c6b312c92
commit f22c3fa856
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/cocoa/gauge.mm
View File

@@ -34,17 +34,20 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID winid, int range,
const wxPoint& pos, const wxSize& size, long style, const wxPoint& pos, const wxSize& size, long style,
const wxValidator& validator, const wxString& name) const wxValidator& validator, const wxString& name)
{ {
//flag checking // NOTE: wxGA_SMOOTH flag is simply ignored (gauges are ALWAYS smooth)
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.
if(!CreateControl(parent,winid,pos,size,style,validator,name)) if(!CreateControl(parent,winid,pos,size,style,validator,name))
return false; return false;
SetNSView([[NSProgressIndicator alloc] initWithFrame: MakeDefaultNSRect(size)]); SetNSView([[NSProgressIndicator alloc] initWithFrame: MakeDefaultNSRect(size)]);
[m_cocoaNSView release]; [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 setMaxValue:range];
[(NSProgressIndicator*)m_cocoaNSView setIndeterminate:NO]; [(NSProgressIndicator*)m_cocoaNSView setIndeterminate:NO];