From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 12 Mar 2006 15:10:23 +0000 (+0000)
Subject: non virtual dtors warning fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/31e57091f20015ec946b8d3f691d3b26748f9783

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 2a90d41451..f2a2800f5f 100644
--- 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 1eb7b72905..5df066909a 100644
--- 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 146b9d66b7..281bf55d4d 100644
--- 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 948f41ea3f..3bc90f9396 100644
--- 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 52bad3da13..d3c75cfb90 100644
--- 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 4edb1f22b9..de2a8c464b 100644
--- 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 cb30270c13..34cbd1ac46 100644
--- 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 7fb9c79dd1..7fdaba8c3a 100644
--- 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 e7d8e342c6..45225f9bc5 100644
--- 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