Refactored & cleaned up wxChoice & wxComboBox code, fixed client data

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

diff --git a/include/wx/mac/menuitem.h b/include/wx/mac/menuitem.h
index 7e9fab32fb7b33a217a7060559d23f3db5d4d1a7..459452596103a0cb24b853fc15d9423457724cf1 100644 (file)
--- a/include/wx/mac/menuitem.h
+++ b/include/wx/mac/menuitem.h
@@ -12,7 +12,7 @@
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "menuitem.h"
 #endif
 
 #pragma interface "menuitem.h"
 #endif
 


@@ -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();
 


@@ -56,6 +56,9 @@ public:
     virtual void Check(bool bDoCheck = TRUE);
     virtual bool IsChecked() const;
 
     virtual void Check(bool bDoCheck = TRUE);
     virtual bool IsChecked() const;
 

+    virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
+    virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
+

 #if wxUSE_ACCEL
     virtual wxAcceleratorEntry *GetAccel() const;
 #endif // wxUSE_ACCEL
 #if wxUSE_ACCEL
     virtual wxAcceleratorEntry *GetAccel() const;
 #endif // wxUSE_ACCEL


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

-       static 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:
 
 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)
 };