Don't use invoking window in wxGTK wxMenuBar implementation.

[wxWidgets.git] / include / wx / cocoa / NSScroller.h

diff --git a/include/wx/cocoa/NSScroller.h b/include/wx/cocoa/NSScroller.h
index 948f41ea3f159bfa6b4b1c41339262857c3a257e..3bc90f9396065836049c8e0f205368bfc52c8d17 100644 (file)
--- a/include/wx/cocoa/NSScroller.h
+++ b/include/wx/cocoa/NSScroller.h
@@ -25,13 +25,15 @@ class wxCocoaNSScroller
     WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSScroller);
 public:
     void AssociateNSScroller(WX_NSScroller cocoaNSScroller);
     WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSScroller);
 public:
     void AssociateNSScroller(WX_NSScroller cocoaNSScroller);

-    inline void DisassociateNSScroller(WX_NSScroller cocoaNSScroller)
+    void DisassociateNSScroller(WX_NSScroller cocoaNSScroller)

     {
         if(cocoaNSScroller)
             sm_cocoaHash.erase(cocoaNSScroller);
     }
 
     virtual void Cocoa_wxNSScrollerAction(void) = 0;
     {
         if(cocoaNSScroller)
             sm_cocoaHash.erase(cocoaNSScroller);
     }
 
     virtual void Cocoa_wxNSScrollerAction(void) = 0;

+    virtual ~wxCocoaNSScroller() { }
+

 protected:
     static const wxObjcAutoRefFromAlloc<struct objc_object*> sm_cocoaTarget;
 };
 protected:
     static const wxObjcAutoRefFromAlloc<struct objc_object*> sm_cocoaTarget;
 };