Further Wince fixes

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

diff --git a/src/cocoa/notebook.mm b/src/cocoa/notebook.mm
index c77473f95afdfc175b791d0876bcbc48969c5a99..12863c1b90ed177376c7ff93bef83400ed8f28b2 100644 (file)
--- a/src/cocoa/notebook.mm
+++ b/src/cocoa/notebook.mm
@@ -6,7 +6,7 @@
 // Created:     2004/04/08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
 // Created:     2004/04/08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott

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

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


@@ -15,8 +15,8 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/notebook.h"

 #endif //WX_PRECOMP
 #endif //WX_PRECOMP

+#include "wx/notebook.h"

 #include "wx/imaglist.h"
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/imaglist.h"
 
 #include "wx/cocoa/autorelease.h"


@@ -180,7 +180,7 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
     [tvitem retain];
     [GetNSTabView() removeTabViewItem:tvitem];
     // Remove the child window as a notebook page
     [tvitem retain];
     [GetNSTabView() removeTabViewItem:tvitem];
     // Remove the child window as a notebook page

-    wxASSERT([tvitem view] == page->GetNSViewForSuperview());
+    wxASSERT(static_cast<NSView*>([tvitem view]) == page->GetNSViewForSuperview());

     [tvitem setView:nil];
     [tvitem release];
     // Make it back into a normal child window
     [tvitem setView:nil];
     [tvitem release];
     // Make it back into a normal child window