flag checkin'

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/gauge.mm b/src/cocoa/gauge.mm
index 1769e1062fdb8c553c02c6cf82c0ddd355ec1e34..3405ae7db51aaf4dc39bb59ce17f54dc71258dbd 100644 (file)
--- a/src/cocoa/gauge.mm
+++ b/src/cocoa/gauge.mm
@@ -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)
 {
             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)]);
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
     SetNSView([[NSProgressIndicator alloc] initWithFrame: MakeDefaultNSRect(size)]);

diff --git a/src/cocoa/spinbutt.mm b/src/cocoa/spinbutt.mm
index 86c8b886af684422be067747ed5bb450e9d79946..a304c38be5be61baca461477ee0e1e409aba6606 100644 (file)
--- a/src/cocoa/spinbutt.mm
+++ b/src/cocoa/spinbutt.mm
@@ -30,12 +30,14 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos, const wxSize& size, long style,
             const wxString& name)
 {
             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];
     
     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
     [(NSStepper*)m_cocoaNSView setValueWraps:style & wxSP_WRAP]; //default == true, evidently
     
     //final setup

diff --git a/src/cocoa/tooltip.mm b/src/cocoa/tooltip.mm
index fcc9c6e0aa120deb7ade662eff33d569404ace6d..a1eeed486aa98e23c206fda9b720b9a71cb12609 100644 (file)
--- a/src/cocoa/tooltip.mm
+++ b/src/cocoa/tooltip.mm
@@ -29,6 +29,10 @@
 
 #import <AppKit/NSView.h>
 
 
 #import <AppKit/NSView.h>
 

+//
+// Private object in AppKit - exists in 10.2 at least -  
+// most likely exists earlier too
+//

 @interface NSToolTipManager : NSObject
 {
 /*
 @interface NSToolTipManager : NSObject
 {
 /*

diff --git a/src/cocoa/utilsexc.mm b/src/cocoa/utilsexc.mm
index a6fa6e499a4e32b3171918b7771795eb2e984b35..13400d029a9e7239b758c7d16656fe0e7ea4cbff 100644 (file)
--- a/src/cocoa/utilsexc.mm
+++ b/src/cocoa/utilsexc.mm
@@ -15,6 +15,7 @@
 #ifndef WX_PRECOMP
 #endif
 #include "wx/unix/execute.h"
 #ifndef WX_PRECOMP
 #endif
 #include "wx/unix/execute.h"

+#include "wx/utils.h"

 
 #if 0
 
 
 #if 0