non virtual dtors warning fixes

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

diff --git a/include/wx/cocoa/NSButton.h b/include/wx/cocoa/NSButton.h
index 2a90d41451f6cb54f70286f1bb366020e435e461..f2a2800f5f9b451e6f16b247b416c3729b1ffca9 100644 (file)
--- a/include/wx/cocoa/NSButton.h
+++ b/include/wx/cocoa/NSButton.h
@@ -23,13 +23,15 @@ class wxCocoaNSButton
     WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSButton);
 public:
     void AssociateNSButton(WX_NSButton cocoaNSButton);
-    inline void DisassociateNSButton(WX_NSButton cocoaNSButton)
+    void DisassociateNSButton(WX_NSButton cocoaNSButton)
     {
         if(cocoaNSButton)
             sm_cocoaHash.erase(cocoaNSButton);
     }
 
     virtual void Cocoa_wxNSButtonAction(void) = 0;
+    virtual ~wxCocoaNSButton() { }
+
 protected:
     static const wxObjcAutoRefFromAlloc<struct objc_object*> sm_cocoaTarget;
 };

diff --git a/include/wx/cocoa/NSControl.h b/include/wx/cocoa/NSControl.h
index 1eb7b729051481757d487abc5b1a26f71dba39ff..5df066909ae3342c51f27d9a99fa8a2c229928e3 100644 (file)
--- a/include/wx/cocoa/NSControl.h
+++ b/include/wx/cocoa/NSControl.h
@@ -22,6 +22,9 @@ class wxCocoaNSControl
 public:
     virtual void CocoaTarget_action() {}
 //    virtual void Cocoa_didChangeText(void) = 0;
+
+    virtual ~wxCocoaNSControl() { }
+
 protected:
     static struct objc_object *sm_cocoaTarget;
 };

diff --git a/include/wx/cocoa/NSMenu.h b/include/wx/cocoa/NSMenu.h
index 146b9d66b755c9dd46c330cfdd04317ed5d10ec9..281bf55d4d0b9c0d3a23880cb3ef4b851b8c36a9 100644 (file)
--- a/include/wx/cocoa/NSMenu.h
+++ b/include/wx/cocoa/NSMenu.h
@@ -40,6 +40,8 @@ public:
     virtual void CocoaNotification_menuDidRemoveItem(WX_NSNotification notification) {}
     virtual void CocoaNotification_menuDidSendAction(WX_NSNotification notification) {}
     virtual void CocoaNotification_menuWillSendAction(WX_NSNotification notification) {}
+    virtual ~wxCocoaNSMenu() { }
+
 protected:
     static struct objc_object *sm_cocoaObserver;
 };

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);
-    inline void DisassociateNSScroller(WX_NSScroller cocoaNSScroller)
+    void DisassociateNSScroller(WX_NSScroller cocoaNSScroller)
     {
         if(cocoaNSScroller)
             sm_cocoaHash.erase(cocoaNSScroller);
     }
 
     virtual void Cocoa_wxNSScrollerAction(void) = 0;
+    virtual ~wxCocoaNSScroller() { }
+
 protected:
     static const wxObjcAutoRefFromAlloc<struct objc_object*> sm_cocoaTarget;
 };

diff --git a/include/wx/cocoa/NSTabView.h b/include/wx/cocoa/NSTabView.h
index 52bad3da133ed77c5f1935552127b0886fa44568..d3c75cfb90368ea4048848fbe0d4f7e6da21213d 100644 (file)
--- a/include/wx/cocoa/NSTabView.h
+++ b/include/wx/cocoa/NSTabView.h
@@ -27,6 +27,8 @@ public:
     void DisassociateNSTabView(WX_NSTabView ocoaNSTabView);
     virtual void CocoaDelegate_tabView_didSelectTabViewItem(WX_NSTabViewItem tabviewItem) = 0;
     virtual bool CocoaDelegate_tabView_shouldSelectTabViewItem(WX_NSTabViewItem tabviewItem) = 0;
+    virtual ~wxCocoaNSTabView() { }
+
 protected:
     static wxObjcAutoRefFromAlloc<struct objc_object*> sm_cocoaDelegate;
 };

diff --git a/include/wx/cocoa/NSTableView.h b/include/wx/cocoa/NSTableView.h
index 4edb1f22b98a9cdbe1a2b5c0dc490252b766f2b4..de2a8c464b1a7ddec2b3b0967f103fd176459541 100644 (file)
--- a/include/wx/cocoa/NSTableView.h
+++ b/include/wx/cocoa/NSTableView.h
@@ -24,6 +24,7 @@ public:
     virtual int CocoaDataSource_numberOfRows() = 0;
     virtual struct objc_object* CocoaDataSource_objectForTableColumn(
         WX_NSTableColumn tableColumn, int rowIndex) = 0;
+    virtual ~wxCocoaNSTableView() { }
 };
 
 #endif // _WX_COCOA_NSTABLEVIEW_H_

diff --git a/include/wx/cocoa/NSTextField.h b/include/wx/cocoa/NSTextField.h
index cb30270c13e9782720bd84cdcfb57f19913e440c..34cbd1ac4668487dbb523a6592fd3bfe91a6a27f 100644 (file)
--- a/include/wx/cocoa/NSTextField.h
+++ b/include/wx/cocoa/NSTextField.h
@@ -21,6 +21,7 @@ class wxCocoaNSTextField
     WX_DECLARE_OBJC_INTERFACE(NSTextField)
 protected:
     virtual void Cocoa_didChangeText(void) = 0;
+    virtual ~wxCocoaNSTextField() { }
 };
 
 #endif // _WX_COCOA_NSTEXTFIELD_H_

diff --git a/include/wx/cocoa/NSView.h b/include/wx/cocoa/NSView.h
index 7fb9c79dd18600243fdb88f9365de1767199d4e7..7fdaba8c3a7cb00772770b70fc8f44c0a1de61dc 100644 (file)
--- a/include/wx/cocoa/NSView.h
+++ b/include/wx/cocoa/NSView.h
@@ -62,6 +62,7 @@ public:
     {   return false; }
     virtual bool Cocoa_resetCursorRects()
     {  return false; }
+    virtual ~wxCocoaNSView() { }
 };
 
 #endif // _WX_COCOA_NSVIEW_H_

diff --git a/include/wx/cocoa/combobox.h b/include/wx/cocoa/combobox.h
index e7d8e342c6a5bed3d5a66fe0faeb1aaa979137a0..45225f9bc5dea1906dccab0c0e6842faefdccd38 100644 (file)
--- a/include/wx/cocoa/combobox.h
+++ b/include/wx/cocoa/combobox.h
@@ -28,6 +28,7 @@ public:
     void DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox);
 
     virtual void doWxEvent(int nEvent) = 0;
+    virtual ~wxCocoaNSComboBox() { }
 };
 
 //begin combobox.h