Don't reset bullet number and outline number when applying style sheet.

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

diff --git a/src/cocoa/spinbutt.mm b/src/cocoa/spinbutt.mm
index 9cc50459470d041dc87717d659269f9b17258434..2e3f8e9c4a02430b2719ac2888e178263acf1f14 100644 (file)
--- a/src/cocoa/spinbutt.mm
+++ b/src/cocoa/spinbutt.mm
@@ -30,10 +30,17 @@ 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
+    [(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)
@@ -56,7 +63,7 @@ int wxSpinButton::GetValue() const
 
 void wxSpinButton::SetValue(int value)
 {
-    return [(NSStepper*)m_cocoaNSView setIntValue:value];
+    [(NSStepper*)m_cocoaNSView setIntValue:value];
 }
 
 void wxSpinButton::SetRange(int minValue, int maxValue)
@@ -73,7 +80,7 @@ void wxSpinButton::CocoaTarget_action()
     wxSpinEvent event(wxEVT_SCROLL_THUMBTRACK, GetId());
     event.SetPosition(GetValue());
     event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
+    HandleWindowEvent(event);
 }
 
 #endif // wxUSE_SPINBTN