check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/cocoa/notebook.mm b/src/cocoa/notebook.mm
index a4f535f2b8271cd5bf73d33037a23d15143dbd5a..10e04d98e70f6f780fe91f65f5d0203ba341be12 100644 (file)
--- a/src/cocoa/notebook.mm
+++ b/src/cocoa/notebook.mm
@@ -21,6 +21,7 @@
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"

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

 
 #import <AppKit/NSTabView.h>
 #import <AppKit/NSTabViewItem.h>
 
 #import <AppKit/NSTabView.h>
 #import <AppKit/NSTabViewItem.h>


@@ -48,6 +49,7 @@
 - (NSImage*)image;
 - (void)setImage:(NSImage*)image;
 @end // interface WXCTabViewImageItem : NSTabViewItem
 - (NSImage*)image;
 - (void)setImage:(NSImage*)image;
 @end // interface WXCTabViewImageItem : NSTabViewItem

+WX_DECLARE_GET_OBJC_CLASS(WXCTabViewImageItem,NSTabViewItem)

 
 @implementation WXCTabViewImageItem : NSTabViewItem
 - (id)init
 
 @implementation WXCTabViewImageItem : NSTabViewItem
 - (id)init


@@ -120,6 +122,7 @@
 }
 
 @end // implementation WXCTabViewImageItem : NSTabViewItem
 }
 
 @end // implementation WXCTabViewImageItem : NSTabViewItem

+WX_IMPLEMENT_GET_OBJC_CLASS(WXCTabViewImageItem,NSTabViewItem)

 
 // ========================================================================
 // wxNotebookEvent
 
 // ========================================================================
 // wxNotebookEvent


@@ -218,7 +221,7 @@ bool wxNotebook::InsertPage( size_t pos,
 {
     wxAutoNSAutoreleasePool pool;
     m_pages.Insert(page,pos);
 {
     wxAutoNSAutoreleasePool pool;
     m_pages.Insert(page,pos);

-    NSTabViewItem *tvitem = [[WXCTabViewImageItem alloc] initWithIdentifier:nil];
+    NSTabViewItem *tvitem = [[WX_GET_OBJC_CLASS(WXCTabViewImageItem) alloc] initWithIdentifier:nil];

     [tvitem setLabel: wxNSStringWithWxString(title)];
     const wxBitmap *bmp = (imageId!=-1)?m_imageList->GetBitmapPtr(imageId):NULL;
     if(bmp)
     [tvitem setLabel: wxNSStringWithWxString(title)];
     const wxBitmap *bmp = (imageId!=-1)?m_imageList->GetBitmapPtr(imageId):NULL;
     if(bmp)


@@ -322,7 +325,7 @@ bool wxNotebook::CocoaDelegate_tabView_shouldSelectTabViewItem(WX_NSTabViewItem
     wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, GetId(),
         [GetNSTabView() indexOfTabViewItem:tabViewItem], GetSelection());
     event.SetEventObject(this);
     wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, GetId(),
         [GetNSTabView() indexOfTabViewItem:tabViewItem], GetSelection());
     event.SetEventObject(this);

-    return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed();
+    return !HandleWindowEvent(event) || event.IsAllowed();

 }
 
 #endif // wxUSE_NOTEBOOK
 }
 
 #endif // wxUSE_NOTEBOOK