moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

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

diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h
index 75649d9f30bf9ef7faaff49f3e9d15ed374b6526..dc698147364610523e3923523c6d6fff724b651a 100644 (file)
--- a/include/wx/motif/menuitem.h
+++ b/include/wx/motif/menuitem.h
@@ -2,7 +2,7 @@
 // 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>
@@ -16,11 +16,15 @@
     #pragma interface "menuitem.h"
 #endif
 
+#include "wx/bitmap.h"
+
+class WXDLLEXPORT wxMenuBar;
+
 // ----------------------------------------------------------------------------
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMenuItem: public wxMenuItemBase
+class wxMenuItem : public wxMenuItemBase
 {
 public:
     // ctor & dtor
@@ -36,6 +40,12 @@ public:
     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();
 
@@ -55,6 +65,7 @@ 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)
 };