no changes, just remove #if'd out code

[wxWidgets.git] / include / wx / cocoa / menuitem.h

diff --git a/include/wx/cocoa/menuitem.h b/include/wx/cocoa/menuitem.h
index 303c73b6e7dfcf7df1aebd23f97516b39bb0b454..01e3f5133610254ee412086d03dad6b146d58b46 100644 (file)
--- a/include/wx/cocoa/menuitem.h
+++ b/include/wx/cocoa/menuitem.h
@@ -4,7 +4,7 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/13
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/13

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -15,6 +15,8 @@
 #include "wx/hashmap.h"
 #include "wx/bitmap.h"
 
 #include "wx/hashmap.h"
 #include "wx/bitmap.h"
 

+#include "wx/cocoa/ObjcRef.h"
+

 // ========================================================================
 // wxMenuItem
 // ========================================================================
 // ========================================================================
 // wxMenuItem
 // ========================================================================


@@ -23,18 +25,18 @@
 class wxMenuItemCocoa;
 WX_DECLARE_HASH_MAP(WX_NSMenuItem,wxMenuItem*,wxPointerHash,wxPointerEqual,wxMenuItemCocoaHash);
 
 class wxMenuItemCocoa;
 WX_DECLARE_HASH_MAP(WX_NSMenuItem,wxMenuItem*,wxPointerHash,wxPointerEqual,wxMenuItemCocoaHash);
 

-class WXDLLEXPORT wxMenuItemCocoa : public wxMenuItemBase
+class WXDLLIMPEXP_CORE wxMenuItemCocoa : public wxMenuItemBase

 {
 public:
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
 {
 public:
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------

-    wxMenuItemCocoa(wxMenu *parentMenu = (wxMenu *)NULL,
+    wxMenuItemCocoa(wxMenu *parentMenu = NULL,

                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,
                wxItemKind kind = wxITEM_NORMAL,

-               wxMenu *subMenu = (wxMenu *)NULL);
+               wxMenu *subMenu = NULL);

     virtual ~wxMenuItemCocoa();
 
 // ------------------------------------------------------------------------
     virtual ~wxMenuItemCocoa();
 
 // ------------------------------------------------------------------------


@@ -49,15 +51,19 @@ public:
             return iter->second;
         return NULL;
     }
             return iter->second;
         return NULL;
     }

+    void CocoaItemSelected();
+    bool Cocoa_validateMenuItem();

 protected:
 protected:

+    void CocoaSetKeyEquivalent();

     WX_NSMenuItem m_cocoaNSMenuItem;
     static wxMenuItemCocoaHash sm_cocoaHash;
     WX_NSMenuItem m_cocoaNSMenuItem;
     static wxMenuItemCocoaHash sm_cocoaHash;

+    static wxObjcAutoRefFromAlloc<struct objc_object *> sm_cocoaTarget;

 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 public:
     // override base class virtuals to update the item appearance on screen
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 public:
     // override base class virtuals to update the item appearance on screen

-    virtual void SetText(const wxString& text);
+    virtual void SetItemLabel(const wxString& text);

     virtual void SetCheckable(bool checkable);
 
     virtual void Enable(bool enable = TRUE);
     virtual void SetCheckable(bool checkable);
 
     virtual void Enable(bool enable = TRUE);