Add virtual ~wxAnyScrollHelperBase() to fix compiler warning.

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

diff --git a/src/cocoa/NSTabView.mm b/src/cocoa/NSTabView.mm
index 32a57511965fe1489f89e7e70bb2b8e5676bd4c0..16e1ff3f4a9c7663a0fb634ffff8cc3c3a8c5bff 100644 (file)
--- a/src/cocoa/NSTabView.mm
+++ b/src/cocoa/NSTabView.mm
@@ -1,12 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/NSTabView.mm
+// Name:        src/cocoa/NSTabView.mm

 // Purpose:     wxCocoaNSTabView
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/04/08
 // Purpose:     wxCocoaNSTabView
 // Author:      David Elliott
 // Modified by:
 // Created:     2004/04/08

-// RCS-ID:      $Id$

 // Copyright:   (c) 2004 David Elliott
 // Copyright:   (c) 2004 David Elliott

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -15,6 +14,8 @@
 
 #include "wx/cocoa/NSTabView.h"
 
 
 #include "wx/cocoa/NSTabView.h"
 

+#include "wx/cocoa/objc/objc_uniquifying.h"
+

 #include <AppKit/NSTabView.h>
 
 // ============================================================================
 #include <AppKit/NSTabView.h>
 
 // ============================================================================


@@ -27,6 +28,7 @@
 - (void)tabView:(NSTabView*)tabView didSelectTabViewItem:(NSTabViewItem*)tabViewItem;
 - (BOOL)tabView:(NSTabView*)tabView shouldSelectTabViewItem:(NSTabViewItem*)tabViewItem;
 @end // interface wxNSTabViewDelegate : NSObject
 - (void)tabView:(NSTabView*)tabView didSelectTabViewItem:(NSTabViewItem*)tabViewItem;
 - (BOOL)tabView:(NSTabView*)tabView shouldSelectTabViewItem:(NSTabViewItem*)tabViewItem;
 @end // interface wxNSTabViewDelegate : NSObject

+WX_DECLARE_GET_OBJC_CLASS(wxNSTabViewDelegate,NSObject)

 
 @implementation wxNSTabViewDelegate : NSObject
 - (void)tabView:(NSTabView*)tabView didSelectTabViewItem:(NSTabViewItem*)tabViewItem
 
 @implementation wxNSTabViewDelegate : NSObject
 - (void)tabView:(NSTabView*)tabView didSelectTabViewItem:(NSTabViewItem*)tabViewItem


@@ -45,13 +47,14 @@
 }
 
 @end // implementation wxNSTabViewDelegate : NSObject
 }
 
 @end // implementation wxNSTabViewDelegate : NSObject

+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSTabViewDelegate,NSObject)

 
 // ============================================================================
 // class wxCocoaNSTabView
 // ============================================================================
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSTabView)
 
 
 // ============================================================================
 // class wxCocoaNSTabView
 // ============================================================================
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSTabView)
 

-wxObjcAutoRefFromAlloc<struct objc_object*> wxCocoaNSTabView::sm_cocoaDelegate = [[wxNSTabViewDelegate alloc] init];
+wxObjcAutoRefFromAlloc<struct objc_object*> wxCocoaNSTabView::sm_cocoaDelegate = [[WX_GET_OBJC_CLASS(wxNSTabViewDelegate) alloc] init];

 
 void wxCocoaNSTabView::AssociateNSTabView(WX_NSTabView cocoaNSTabView)
 {
 
 void wxCocoaNSTabView::AssociateNSTabView(WX_NSTabView cocoaNSTabView)
 {