X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b59cdbfaf7df79499424c92ff6177736429ff8a..1b0fb34be895a9596131233edd1bf68b10c052b4:/include/wx/motif/menuitem.h

diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h
index d2c865aa66..f6580cdad0 100644
--- a/include/wx/motif/menuitem.h
+++ b/include/wx/motif/menuitem.h
@@ -13,9 +13,11 @@
 #define _WX_MOTIF_MENUITEM_H
 
 #ifdef __GNUG__
-    #pragma interface "menuitem.h"
+#pragma interface "menuitem.h"
 #endif
 
+#include "wx/bitmap.h"
+
 class WXDLLEXPORT wxMenuBar;
 
 // ----------------------------------------------------------------------------
@@ -27,37 +29,44 @@ class wxMenuItem : public wxMenuItemBase
 public:
     // ctor & dtor
     wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL,
-               int id = wxID_SEPARATOR,
-               const wxString& text = wxEmptyString,
-               const wxString& help = wxEmptyString,
-               bool isCheckable = FALSE,
-               wxMenu *subMenu = (wxMenu *)NULL);
+        int id = wxID_SEPARATOR,
+        const wxString& text = wxEmptyString,
+        const wxString& help = wxEmptyString,
+        bool isCheckable = FALSE,
+        wxMenu *subMenu = (wxMenu *)NULL);
     ~wxMenuItem();
-
+    
     // accessors (some more are inherited from wxOwnerDrawn or are below)
     virtual void SetText(const wxString& label);
     virtual void Enable(bool enable = TRUE);
     virtual void Check(bool check = TRUE);
-
+    // included SetBitmap and GetBitmap as copied from the GTK include file
+    // I'm not sure if this works but it silences the linker in the
+    // menu sample.
+    //     JJ
+    virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
+    virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
+    
     void DeleteSubMenu();
-
+    
     // implementation from now on
     void CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMenu);
     void DestroyItem(bool full);
-
+    
     WXWidget GetButtonWidget() const { return m_buttonWidget; }
-
+    
     wxMenuBar* GetMenuBar() const { return m_menuBar; }
     void SetMenuBar(wxMenuBar* menuBar) { m_menuBar = menuBar; }
-
+    
     wxMenu* GetTopMenu() const { return m_topMenu; }
     void SetTopMenu(wxMenu* menu) { m_topMenu = menu; }
-
+    
 private:
     WXWidget    m_buttonWidget;
     wxMenuBar*  m_menuBar;
     wxMenu*     m_topMenu;        // Top-level menu e.g. popup-menu
-
+    wxBitmap  m_bitmap; // Bitmap for menuitem, if any
+    
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };