Fix so OGL can build without wxBuffer

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

diff --git a/include/wx/mac/menuitem.h b/include/wx/mac/menuitem.h
index 0a85aa372533547a3650f393b32b1ec29618eaea..6a35c72294102e29bba6e4e5a3b4e1061a1a7773 100644 (file)
--- a/include/wx/mac/menuitem.h
+++ b/include/wx/mac/menuitem.h
@@ -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 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:
 
 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)
 };