Committing in .
Modified Files: wxWindows/include/wx/motif/menuitem.h ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
2193517f1b
commit
5fdff4a5b4
@ -16,6 +16,8 @@
|
||||
#pragma interface "menuitem.h"
|
||||
#endif
|
||||
|
||||
#include "wx/bitmap.h"
|
||||
|
||||
class WXDLLEXPORT wxMenuBar;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -38,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();
|
||||
|
||||
@ -57,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)
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user