X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49bf4e3e689c2131994aa2aab3c9eca6255a46eb..c084a1ac064cff672b777e1e6a3624fd838387e7:/src/cocoa/notebook.mm

diff --git a/src/cocoa/notebook.mm b/src/cocoa/notebook.mm
index 33687e9f0b..0bad47d58d 100644
--- 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/objc/objc_uniquifying.h"
 
 #import <AppKit/NSTabView.h>
 #import <AppKit/NSTabViewItem.h>
@@ -48,6 +49,7 @@
 - (NSImage*)image;
 - (void)setImage:(NSImage*)image;
 @end // interface WXCTabViewImageItem : NSTabViewItem
+WX_DECLARE_GET_OBJC_CLASS(WXCTabViewImageItem,NSTabViewItem)
 
 @implementation WXCTabViewImageItem : NSTabViewItem
 - (id)init
@@ -64,6 +66,7 @@
 - (void)dealloc
 {
     [m_image release];
+    [super dealloc];
 }
 
 - (NSSize)sizeOfLabel:(BOOL)shouldTruncateLabel
@@ -119,18 +122,12 @@
 }
 
 @end // implementation WXCTabViewImageItem : NSTabViewItem
-
-// ========================================================================
-// wxNotebookEvent
-// ========================================================================
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
-IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
+WX_IMPLEMENT_GET_OBJC_CLASS(WXCTabViewImageItem,NSTabViewItem)
 
 // ========================================================================
 // wxNotebook
 // ========================================================================
-IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxBookCtrlBase)
 BEGIN_EVENT_TABLE(wxNotebook, wxNotebookBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxNotebook,NSTabView,NSView,NSView)
@@ -146,6 +143,23 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID winid,
         return false;
     m_cocoaNSView = NULL;
     SetNSTabView([[NSTabView alloc] initWithFrame:MakeDefaultNSRect(size)]);
+
+    do
+    {
+        NSTabViewType tabViewType;
+        if(style & wxNB_TOP)
+            tabViewType = NSTopTabsBezelBorder;
+        else if(style & wxNB_LEFT)
+            tabViewType = NSLeftTabsBezelBorder;
+        else if(style & wxNB_RIGHT)
+            tabViewType = NSRightTabsBezelBorder;
+        else if(style & wxNB_BOTTOM)
+            tabViewType = NSBottomTabsBezelBorder;
+        else
+            break;
+        [GetNSTabView() setTabViewType:tabViewType];
+    } while(0);
+
     if(m_parent)
         m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,size);
@@ -200,7 +214,7 @@ bool wxNotebook::InsertPage( size_t 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)
@@ -260,8 +274,23 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage)
     return true;
 }
 
-
 int wxNotebook::SetSelection(size_t nPage)
+{
+    const int pageOld = GetSelection();
+
+    if ( !SendPageChangingEvent(nPage) )
+        return pageOld;
+
+    int page = ChangeSelection(nPage);
+    if ( page != wxNOT_FOUND )
+    {
+        SendPageChangedEvent(pageOld);
+    }
+
+    return page;
+}
+
+int wxNotebook::ChangeSelection(size_t nPage)
 {
     wxAutoNSAutoreleasePool pool;
     [GetNSTabView() selectTabViewItemAtIndex:nPage];
@@ -279,17 +308,18 @@ int wxNotebook::GetSelection() const
 void wxNotebook::CocoaDelegate_tabView_didSelectTabViewItem(WX_NSTabViewItem tabViewItem)
 {
     // FIXME: oldSel probably == newSel
-    wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, GetId(),
+    wxBookCtrlEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, GetId(),
         [GetNSTabView() indexOfTabViewItem:tabViewItem], GetSelection());
     event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxNotebook::CocoaDelegate_tabView_shouldSelectTabViewItem(WX_NSTabViewItem tabViewItem)
 {
-    wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, GetId(),
+    wxBookCtrlEvent 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