content must be changeable by wx even though control may be disabled

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

diff --git a/src/osx/cocoa/notebook.mm b/src/osx/cocoa/notebook.mm
index 2c47ce8133fa7ccc49808e642bd54df75673a49c..05bce718e85e42ea94fa12cb67287331375711ad 100644 (file)
--- a/src/osx/cocoa/notebook.mm
+++ b/src/osx/cocoa/notebook.mm
@@ -41,11 +41,8 @@
 
 @interface wxNSTabView : NSTabView
 {
 
 @interface wxNSTabView : NSTabView
 {

-    WXCOCOAIMPL_COMMON_MEMBERS

 }
 
 }
 

-WXCOCOAIMPL_COMMON_INTERFACE
-

 @end
 
 @implementation wxTabViewController
 @end
 
 @implementation wxTabViewController


@@ -58,8 +55,10 @@ WXCOCOAIMPL_COMMON_INTERFACE
 
 - (BOOL)tabView:(NSTabView *)tabView shouldSelectTabViewItem:(NSTabViewItem *)tabViewItem
 {
 
 - (BOOL)tabView:(NSTabView *)tabView shouldSelectTabViewItem:(NSTabViewItem *)tabViewItem
 {

+    wxUnusedVar(tabViewItem);

     wxNSTabView* view = (wxNSTabView*) tabView;
     wxNSTabView* view = (wxNSTabView*) tabView;

-    wxWidgetCocoaImpl* viewimpl = [view implementation];
+    wxWidgetCocoaImpl* viewimpl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( view );
+

     if ( viewimpl )
     {
         // wxNotebook* wxpeer = (wxNotebook*) viewimpl->GetWXPeer();
     if ( viewimpl )
     {
         // wxNotebook* wxpeer = (wxNotebook*) viewimpl->GetWXPeer();


@@ -70,8 +69,9 @@ WXCOCOAIMPL_COMMON_INTERFACE
 - (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem;
 
 {
 - (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem;
 
 {

+    wxUnusedVar(tabViewItem);

     wxNSTabView* view = (wxNSTabView*) tabView;
     wxNSTabView* view = (wxNSTabView*) tabView;

-    wxWidgetCocoaImpl* viewimpl = [view implementation];
+    wxWidgetCocoaImpl* viewimpl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( view );

     if ( viewimpl )
     {
         wxNotebook* wxpeer = (wxNotebook*) viewimpl->GetWXPeer();
     if ( viewimpl )
     {
         wxNotebook* wxpeer = (wxNotebook*) viewimpl->GetWXPeer();


@@ -83,7 +83,15 @@ WXCOCOAIMPL_COMMON_INTERFACE
 
 @implementation wxNSTabView
 
 
 @implementation wxNSTabView
 

-WXCOCOAIMPL_COMMON_IMPLEMENTATION
++ (void)initialize
+{
+    static BOOL initialized = NO;
+    if (!initialized) 
+    {
+        initialized = YES;
+        wxOSXCocoaClassAddWXMethods( self );
+    }
+}

 
 @end
 
 
 @end
 


@@ -219,12 +227,12 @@ public:
 #endif
 */
 wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer, 
 #endif
 */
 wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer, 

-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowMac* WXUNUSED(parent), 
+                                    wxWindowID WXUNUSED(id), 

                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 

-                                    long extraStyle)
+                                    long WXUNUSED(extraStyle))

 {
     static wxTabViewController* controller = NULL;
 
 {
     static wxTabViewController* controller = NULL;
 


@@ -244,7 +252,6 @@ wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
     wxNSTabView* v = [[wxNSTabView alloc] initWithFrame:r];
     [v setTabViewType:tabstyle];
     wxWidgetCocoaImpl* c = new wxCocoaTabView( wxpeer, v );
     wxNSTabView* v = [[wxNSTabView alloc] initWithFrame:r];
     [v setTabViewType:tabstyle];
     wxWidgetCocoaImpl* c = new wxCocoaTabView( wxpeer, v );

-    [v setImplementation:c];

     [v setDelegate: controller];
     return c;
 }
     [v setDelegate: controller];
     return c;
 }