wxChar -> char

[wxWidgets.git] / include / wx / mac / carbon / menu.h

diff --git a/include/wx/mac/carbon/menu.h b/include/wx/mac/carbon/menu.h
index b23e612dc93ae0eb8beecfb04273d5c73d2270d9..1b78b376493b471c4ebf0c949e757719829edd1d 100644 (file)
--- a/include/wx/mac/carbon/menu.h
+++ b/include/wx/mac/carbon/menu.h
@@ -12,11 +12,7 @@
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "menu.h"
-#endif
-
-class WXDLLEXPORT wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxFrame;

 
 #include "wx/arrstr.h"
 
 
 #include "wx/arrstr.h"
 


@@ -35,10 +31,6 @@ public:
 
     virtual ~wxMenu();
 
 
     virtual ~wxMenu();
 

-    // implement base class virtuals
-    virtual wxMenuItem* DoAppend(wxMenuItem *item);
-    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem* DoRemove(wxMenuItem *item);

     virtual void Attach(wxMenuBarBase *menubar) ;
 
     virtual void Break();
     virtual void Attach(wxMenuBarBase *menubar) ;
 
     virtual void Break();


@@ -51,7 +43,7 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

-      int    MacGetIndexFromId( int id ) ; 
+      int    MacGetIndexFromId( int id ) ;

       int    MacGetIndexFromItem( wxMenuItem *pItem ) ;
       void MacEnableMenu( bool bDoEnable ) ;
       // MacOS needs to know about submenus somewhere within this menu
       int    MacGetIndexFromItem( wxMenuItem *pItem ) ;
       void MacEnableMenu( bool bDoEnable ) ;
       // MacOS needs to know about submenus somewhere within this menu


@@ -69,6 +61,14 @@ public:
 
     short MacGetMenuId() { return m_macMenuId ; }
 
 
     short MacGetMenuId() { return m_macMenuId ; }
 

+    wxInt32 MacHandleCommandProcess( wxMenuItem* item, int id, wxWindow* targetWindow = NULL );
+    wxInt32 MacHandleCommandUpdateStatus( wxMenuItem* item, int id, wxWindow* targetWindow = NULL);
+
+protected:
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);
+

 private:
     // common part of all ctors
     void Init();
 private:
     // common part of all ctors
     void Init();


@@ -122,8 +122,8 @@ public:
     virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
 
     virtual void EnableTop( size_t pos, bool flag );
     virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
 
     virtual void EnableTop( size_t pos, bool flag );

-    virtual void SetLabelTop( size_t pos, const wxString& label );
-    virtual wxString GetLabelTop( size_t pos ) const;
+    virtual void SetMenuLabel( size_t pos, const wxString& label );
+    virtual wxString GetMenuLabel( size_t pos ) const;

     virtual bool Enable( bool enable = TRUE );
     // for virtual function hiding
     virtual void Enable( int itemid, bool enable )
     virtual bool Enable( bool enable = TRUE );
     // for virtual function hiding
     virtual void Enable( int itemid, bool enable )