flag checkin'

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton 2005-04-22 01:13:45 +00:00
parent 519fa7734f
commit 571b0b138b
4 changed files with 14 additions and 1 deletions

View File

@ -34,6 +34,12 @@ 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.
if(!CreateControl(parent,winid,pos,size,style,validator,name))
return false;
SetNSView([[NSProgressIndicator alloc] initWithFrame: MakeDefaultNSRect(size)]);

View File

@ -30,12 +30,14 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID winid,
const wxPoint& pos, const wxSize& size, long style,
const wxString& name)
{
//bad flag checking
wxASSERT_MSG( !(style & wxSP_HORIZONTAL), wxT("Horizontal wxSpinButton not supported in cocoa"));
if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
return false;
SetNSControl([[NSStepper alloc] initWithFrame: MakeDefaultNSRect(size)]);
[m_cocoaNSView release];
//flag handling (note wxSP_HORIZONTAL IS _NOT_ Supported in cocoa)
//flag handling
[(NSStepper*)m_cocoaNSView setValueWraps:style & wxSP_WRAP]; //default == true, evidently
//final setup

View File

@ -29,6 +29,10 @@
#import <AppKit/NSView.h>
//
// Private object in AppKit - exists in 10.2 at least -
// most likely exists earlier too
//
@interface NSToolTipManager : NSObject
{
/*

View File

@ -15,6 +15,7 @@
#ifndef WX_PRECOMP
#endif
#include "wx/unix/execute.h"
#include "wx/utils.h"
#if 0