Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

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

diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h
index 4822d8013c36d1fc1afd63cd8014ed1aa3d7772c..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
 // 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>
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -16,6 +16,8 @@
     #pragma interface "menuitem.h"
 #endif
 
     #pragma interface "menuitem.h"
 #endif
 

+#include "wx/bitmap.h"
+

 class WXDLLEXPORT wxMenuBar;
 
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxMenuBar;
 
 // ----------------------------------------------------------------------------


@@ -36,9 +38,14 @@ public:
 
     // accessors (some more are inherited from wxOwnerDrawn or are below)
     virtual void SetText(const wxString& label);
 
     // 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);
     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();
 
 
     void DeleteSubMenu();
 


@@ -58,6 +65,7 @@ private:
     WXWidget    m_buttonWidget;
     wxMenuBar*  m_menuBar;
     wxMenu*     m_topMenu;        // Top-level menu e.g. popup-menu
     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)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };