Committed Jaako's renderer patch

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

diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h
index 4822d8013c36d1fc1afd63cd8014ed1aa3d7772c..c4fc2b41b4cacb10edd332dd0754172f95a66cb7 100644 (file)
--- a/include/wx/motif/menuitem.h
+++ b/include/wx/motif/menuitem.h
@@ -2,19 +2,17 @@
 // Name:        menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin
-// Modified by: 
+// Modified by:
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_MENUITEM_H
 #define _WX_MOTIF_MENUITEM_H
 
-#ifdef __GNUG__
-    #pragma interface "menuitem.h"
-#endif
+#include "wx/bitmap.h"
 
 class WXDLLEXPORT wxMenuBar;
 
@@ -22,7 +20,7 @@ class WXDLLEXPORT wxMenuBar;
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
 // ----------------------------------------------------------------------------
 
-class wxMenuItem : public wxMenuItemBase
+class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
 {
 public:
     // ctor & dtor
@@ -30,35 +28,40 @@ public:
                int id = wxID_SEPARATOR,
                const wxString& text = wxEmptyString,
                const wxString& help = wxEmptyString,
-               bool isCheckable = FALSE,
+               wxItemKind kind = wxITEM_NORMAL,
                wxMenu *subMenu = (wxMenu *)NULL);
     ~wxMenuItem();
-
+    
     // accessors (some more are inherited from wxOwnerDrawn or are below)
     virtual void SetText(const wxString& label);
-    virtual wxString GetLabel() const;
-    virtual void Enable(bool enable = TRUE);
-    virtual void Check(bool check = TRUE);
-
-    void DeleteSubMenu();
-
+    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; }
+    
     // implementation from now on
-    void CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMenu);
+    void CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMenu,
+                     size_t index);
     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)
 };