Use real id for wxPGCanvas

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

diff --git a/src/osx/cocoa/menuitem.mm b/src/osx/cocoa/menuitem.mm
index 87132b46000e6d5d7f5b4816f504ccf88785a6de..680d3c0cc73b66939c1f239bff43fb054895f309 100644 (file)
--- a/src/osx/cocoa/menuitem.mm
+++ b/src/osx/cocoa/menuitem.mm
@@ -16,24 +16,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/log.h"

     #include "wx/menu.h"
 #endif // WX_PRECOMP
 
 #include "wx/osx/private.h"
 
     #include "wx/menu.h"
 #endif // WX_PRECOMP
 
 #include "wx/osx/private.h"
 

-@interface wxNSMenuItem : NSMenuItem
-{
-   wxMenuItemImpl* impl;
-}
-
-- (void) setImplementation:(wxMenuItemImpl*) item;
-- (wxMenuItemImpl*) implementation;
-
-- (void) clickedAction: (id) sender;
-- (BOOL)validateMenuItem:(NSMenuItem *) menuItem;
-
-@end 
-

 @implementation wxNSMenuItem
 
 - (id) init
 @implementation wxNSMenuItem
 
 - (id) init


@@ -44,6 +32,7 @@
 
 - (void) clickedAction: (id) sender
 {
 
 - (void) clickedAction: (id) sender
 {

+    wxUnusedVar(sender);

     if ( impl )
     {
         impl->GetWXPeer()->GetMenu()->HandleCommandProcess(impl->GetWXPeer());
     if ( impl )
     {
         impl->GetWXPeer()->GetMenu()->HandleCommandProcess(impl->GetWXPeer());


@@ -52,6 +41,7 @@
 
 - (BOOL)validateMenuItem:(NSMenuItem *) menuItem
 {
 
 - (BOOL)validateMenuItem:(NSMenuItem *) menuItem
 {

+    wxUnusedVar(menuItem);

     if( impl )
     {
         impl->GetWXPeer()->GetMenu()->HandleCommandUpdateStatus(impl->GetWXPeer());
     if( impl )
     {
         impl->GetWXPeer()->GetMenu()->HandleCommandUpdateStatus(impl->GetWXPeer());


@@ -178,45 +168,51 @@ void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry*
     }
 }
 
     }
 }
 

-class wxMenuItemCocoaImpl : public wxMenuItemImpl 
+class wxMenuItemCocoaImpl : public wxMenuItemImpl

 {
 public :
     wxMenuItemCocoaImpl( wxMenuItem* peer, NSMenuItem* item ) : wxMenuItemImpl(peer), m_osxMenuItem(item)
     {
 {
 public :
     wxMenuItemCocoaImpl( wxMenuItem* peer, NSMenuItem* item ) : wxMenuItemImpl(peer), m_osxMenuItem(item)
     {

+        if ( ![m_osxMenuItem isSeparatorItem] )
+            [(wxNSMenuItem*)m_osxMenuItem setImplementation:this];

     }
     }

-    
+

     ~wxMenuItemCocoaImpl();
     ~wxMenuItemCocoaImpl();

-        
-    void SetBitmap( const wxBitmap& bitmap ) 
+
+    void SetBitmap( const wxBitmap& bitmap )

     {
         [m_osxMenuItem setImage:bitmap.GetNSImage()];
     }
     {
         [m_osxMenuItem setImage:bitmap.GetNSImage()];
     }

-    
-    void Enable( bool enable ) 
+
+    void Enable( bool enable )

     {
         [m_osxMenuItem setEnabled:enable];
     }
     {
         [m_osxMenuItem setEnabled:enable];
     }

-    
-    void Check( bool check ) 
+
+    void Check( bool check )

     {
         [m_osxMenuItem setState:( check ?  NSOnState :  NSOffState) ];
     }
     {
         [m_osxMenuItem setState:( check ?  NSOnState :  NSOffState) ];
     }

-    
+

     void Hide( bool hide )
     {
     void Hide( bool hide )
     {

-        [m_osxMenuItem setHidden:hide ];
+        // NB: setHidden is new as of 10.5 so we should not call it below there
+        if ([m_osxMenuItem respondsToSelector:@selector(setHidden:)])
+            [m_osxMenuItem setHidden:hide ];
+        else
+            wxLogDebug("wxMenuItemCocoaImpl::Hide not yet supported under OS X < 10.5");

     }
     }

-    
-    void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) 
+
+    void SetLabel( const wxString& text, wxAcceleratorEntry *entry )

     {
         wxCFStringRef cfText(text);
         [m_osxMenuItem setTitle:cfText.AsNSString()];
     {
         wxCFStringRef cfText(text);
         [m_osxMenuItem setTitle:cfText.AsNSString()];

-        
+

         if ( entry )
             wxMacCocoaMenuItemSetAccelerator( m_osxMenuItem, entry );
 
     }
         if ( entry )
             wxMacCocoaMenuItemSetAccelerator( m_osxMenuItem, entry );
 
     }

-    
+

     void * GetHMenuItem() { return m_osxMenuItem; }
 
 protected :
     void * GetHMenuItem() { return m_osxMenuItem; }
 
 protected :


@@ -225,20 +221,22 @@ protected :
 
 wxMenuItemCocoaImpl::~wxMenuItemCocoaImpl()
 {
 
 wxMenuItemCocoaImpl::~wxMenuItemCocoaImpl()
 {

+    if ( ![m_osxMenuItem isSeparatorItem] )
+        [(wxNSMenuItem*)m_osxMenuItem setImplementation:nil];

 }
 
 
 wxMenuItemImpl* wxMenuItemImpl::Create( wxMenuItem* peer, wxMenu *pParentMenu,
 }
 
 
 wxMenuItemImpl* wxMenuItemImpl::Create( wxMenuItem* peer, wxMenu *pParentMenu,

-                       int id,
+                       int WXUNUSED(id),

                        const wxString& text,
                        wxAcceleratorEntry *entry,
                        const wxString& text,
                        wxAcceleratorEntry *entry,

-                       const wxString& strHelp,
+                       const wxString& WXUNUSED(strHelp),

                        wxItemKind kind,
                        wxMenu *pSubMenu )
 {
     wxMenuItemImpl* c = NULL;
     NSMenuItem* item = nil;
                        wxItemKind kind,
                        wxMenu *pSubMenu )
 {
     wxMenuItemImpl* c = NULL;
     NSMenuItem* item = nil;

-    
+

     if ( kind == wxITEM_SEPARATOR )
     {
         item = [[NSMenuItem separatorItem] retain];
     if ( kind == wxITEM_SEPARATOR )
     {
         item = [[NSMenuItem separatorItem] retain];


@@ -266,9 +264,5 @@ wxMenuItemImpl* wxMenuItemImpl::Create( wxMenuItem* peer, wxMenu *pParentMenu,
         item = temp;
     }
     c = new wxMenuItemCocoaImpl( peer, item );
         item = temp;
     }
     c = new wxMenuItemCocoaImpl( peer, item );

-    if ( kind != wxITEM_SEPARATOR )
-    {
-        [(wxNSMenuItem*)item setImplementation:c];
-    }

     return c;
 }
     return c;
 }