Reformatted Motif headers; added __WXX11__ symbol support to common headers;
added place-holding src/x11 and include/wx/x11 files. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
#define _WX_MOTIF_MENUITEM_H
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma interface "menuitem.h"
|
||||
#pragma interface "menuitem.h"
|
||||
#endif
|
||||
|
||||
#include "wx/bitmap.h"
|
||||
@@ -29,44 +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
|
||||
// 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)
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user