X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19c7ac3d3bf1ac2113505a805a79c40ce3db1f5b..a533f0504f8067182cad0c26cbba7074248c8c37:/src/osx/cocoa/spinbutt.mm

diff --git a/src/osx/cocoa/spinbutt.mm b/src/osx/cocoa/spinbutt.mm
index da57bbea78..4230bad5e9 100644
--- a/src/osx/cocoa/spinbutt.mm
+++ b/src/osx/cocoa/spinbutt.mm
@@ -18,79 +18,91 @@
 
 @interface wxNSStepper : NSStepper
 {
-    WXCOCOAIMPL_COMMON_MEMBERS
-    int formerValue;
 }
-
-WXCOCOAIMPL_COMMON_INTERFACE
-
- - (void) clickedAction: (id) sender;
-
 @end
 
 @implementation wxNSStepper
 
-- (id)initWithFrame:(NSRect)frame
++ (void)initialize
 {
-    [super initWithFrame:frame];
-    impl = NULL;
-    formerValue = 0;
-    [self setTarget: self];
-    [self setAction: @selector(clickedAction:)];
-    return self;
+    static BOOL initialized = NO;
+    if (!initialized)
+    {
+        initialized = YES;
+        wxOSXCocoaClassAddWXMethods(self);
+    }
 }
 
-- (void) clickedAction: (id) sender
+@end
+
+class wxSpinButtonCocoaImpl : public wxWidgetCocoaImpl
 {
-    if ( impl )
+public :
+    wxSpinButtonCocoaImpl(wxWindowMac* peer , WXWidget w) :
+        wxWidgetCocoaImpl(peer, w)
     {
-        wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
-        if ( wxpeer )
-        {
-            // because wx expects to be able to veto 
-            // a change we must revert the value change
-            // and expose it
-            int currentValue = [self intValue];
-            [self setIntValue:formerValue];
-            int inc = currentValue-formerValue;
-            
-            // adjust for wrap arounds
-            if ( inc > 1 )
-                inc = -1;
-            else if (inc < -1 )
-                inc = 1;
-                
-            if ( inc == 1 )
-                wxpeer->TriggerScrollEvent(wxEVT_SCROLL_LINEUP);
-            else if ( inc == -1 )
-                wxpeer->TriggerScrollEvent(wxEVT_SCROLL_LINEDOWN);
-
-            formerValue = [self intValue];
-        }
+        m_formerValue = 0;
     }
-}
 
--(void)mouseDown:(NSEvent *)event 
+    ~wxSpinButtonCocoaImpl()
+    {
+    }
+
+    virtual void controlAction(WXWidget slf, void* _cmd, void *sender);
+    virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd);
+private:
+    int m_formerValue;
+};
+
+void wxSpinButtonCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
-    formerValue = [self intValue];
-    if ( !impl->DoHandleMouseEvent(event) )
-        [super mouseDown:event];
-}
 
-WXCOCOAIMPL_COMMON_IMPLEMENTATION_NO_MOUSEDOWN
+    // send a release event in case we've been tracking the thumb
+    if ( strcmp( sel_getName((SEL) _cmd) , "mouseDown:") == 0 )
+    {
+        m_formerValue = [(NSStepper*)m_osxView intValue];
+    }
+
+    wxWidgetCocoaImpl::mouseEvent(event, slf, _cmd);
+}
 
-@end
+void wxSpinButtonCocoaImpl::controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender))
+{
+    wxWindow* wxpeer = (wxWindow*) GetWXPeer();
+    if ( wxpeer )
+    {
+        // because wx expects to be able to veto
+        // a change we must revert the value change
+        // and expose it
+        int currentValue = [(NSStepper*)m_osxView intValue];
+        [(NSStepper*)m_osxView setIntValue:m_formerValue];
+        int inc = currentValue-m_formerValue;
+
+        // adjust for wrap arounds
+        if ( inc > 1 )
+            inc = -1;
+        else if (inc < -1 )
+            inc = 1;
+
+        if ( inc == 1 )
+            wxpeer->TriggerScrollEvent(wxEVT_SCROLL_LINEUP);
+        else if ( inc == -1 )
+            wxpeer->TriggerScrollEvent(wxEVT_SCROLL_LINEDOWN);
+
+        m_formerValue = [(NSStepper*)m_osxView intValue];
+    }
+}
 
-wxWidgetImplType* wxWidgetImpl::CreateSpinButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+wxWidgetImplType* wxWidgetImpl::CreateSpinButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,
                                     const wxSize& size,
-                                    long style, 
-                                    long extraStyle)
+                                    long style,
+                                    long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSStepper* v = [[wxNSStepper alloc] initWithFrame:r];
@@ -98,12 +110,11 @@ wxWidgetImplType* wxWidgetImpl::CreateSpinButton( wxWindowMac* wxpeer,
     [v setMinValue: minimum];
     [v setMaxValue: maximum];
     [v setIntValue: value];
-    
+
     if ( style & wxSP_WRAP )
         [v setValueWraps:YES];
-    
-    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
-    [v setImplementation:c];
+
+    wxWidgetCocoaImpl* c = new wxSpinButtonCocoaImpl( wxpeer, v );
     return c;
 }