Added wx/listbase.h with wxListCtrl types, so we can

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

diff --git a/include/wx/mac/menuitem.h b/include/wx/mac/menuitem.h
index cf7a2c57f26d8401ddcfab5ee4922cfab81b7e16..155798089291ff9cf3e4f6303d6f80a0afd234ae 100644 (file)
--- a/include/wx/mac/menuitem.h
+++ b/include/wx/mac/menuitem.h
@@ -43,7 +43,7 @@ public:
                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,
                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,

-               bool isCheckable = FALSE,
+               wxItemKind kind = wxITEM_NORMAL,

                wxMenu *subMenu = (wxMenu *)NULL);
     virtual ~wxMenuItem();
 
                wxMenu *subMenu = (wxMenu *)NULL);
     virtual ~wxMenuItem();
 


@@ -72,10 +72,11 @@ public:
     // menu handle depending on what we're
     int GetRealId() const;
 
     // menu handle depending on what we're
     int GetRealId() const;
 

-    static int MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShortcutChar , UInt8 *outMacModifiers , const char *inItemName , bool useShortcuts ) ;
+    static int MacBuildMenuString(unsigned char* outMacItemText, wxInt16 *outMacShortcutChar , wxUint8 *outMacModifiers , const char *inItemName , bool useShortcuts ) ;

 
 private:
     wxBitmap  m_bitmap; // Bitmap for menuitem, if any
 
 private:
     wxBitmap  m_bitmap; // Bitmap for menuitem, if any

+    void* m_menu ; // the appropriate menu , may also be a system menu

 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };