Added ability to switch off more components of the size page UI

[wxWidgets.git] / src / cocoa / spinbutt.mm

diff --git a/src/cocoa/spinbutt.mm b/src/cocoa/spinbutt.mm
index 9cc50459470d041dc87717d659269f9b17258434..3f952dc3af159ed55c743192c4a1f17e8b71c5c4 100644 (file)
--- a/src/cocoa/spinbutt.mm
+++ b/src/cocoa/spinbutt.mm
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/spinbutt.mm
+// Name:        src/cocoa/spinbutt.mm

 // Purpose:     wxSpinButton
 // Author:      David Elliott
 // Modified by:
 // Purpose:     wxSpinButton
 // Author:      David Elliott
 // Modified by:


@@ -19,9 +19,6 @@
 
 #import <AppKit/NSStepper.h>
 
 
 #import <AppKit/NSStepper.h>
 

-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)

 BEGIN_EVENT_TABLE(wxSpinButton, wxSpinButtonBase)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxSpinButton,NSStepper,NSControl,NSView)
 BEGIN_EVENT_TABLE(wxSpinButton, wxSpinButtonBase)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxSpinButton,NSStepper,NSControl,NSView)


@@ -30,10 +27,17 @@ 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
+    [(NSStepper*)m_cocoaNSView setValueWraps:style & wxSP_WRAP]; //default == true, evidently
+    
+    //final setup

     [(NSStepper*)m_cocoaNSView setTarget: sm_cocoaTarget];
     [(NSStepper*)m_cocoaNSView setAction:@selector(wxNSControlAction:)];
     if(m_parent)
     [(NSStepper*)m_cocoaNSView setTarget: sm_cocoaTarget];
     [(NSStepper*)m_cocoaNSView setAction:@selector(wxNSControlAction:)];
     if(m_parent)


@@ -56,7 +60,7 @@ int wxSpinButton::GetValue() const
 
 void wxSpinButton::SetValue(int value)
 {
 
 void wxSpinButton::SetValue(int value)
 {

-    return [(NSStepper*)m_cocoaNSView setIntValue:value];
+    [(NSStepper*)m_cocoaNSView setIntValue:value];

 }
 
 void wxSpinButton::SetRange(int minValue, int maxValue)
 }
 
 void wxSpinButton::SetRange(int minValue, int maxValue)


@@ -73,7 +77,7 @@ void wxSpinButton::CocoaTarget_action()
     wxSpinEvent event(wxEVT_SCROLL_THUMBTRACK, GetId());
     event.SetPosition(GetValue());
     event.SetEventObject(this);
     wxSpinEvent event(wxEVT_SCROLL_THUMBTRACK, GetId());
     event.SetPosition(GetValue());
     event.SetEventObject(this);

-    GetEventHandler()->ProcessEvent(event);
+    HandleWindowEvent(event);

 }
 
 #endif // wxUSE_SPINBTN
 }
 
 #endif // wxUSE_SPINBTN