wxMenu code clean up
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -28,63 +28,65 @@
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxMenuItem;
|
||||
|
||||
class wxMenu;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxMenuItem
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxMenuItem: public wxObject
|
||||
class wxMenuItem : public wxObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxMenuItem)
|
||||
|
||||
public:
|
||||
wxMenuItem();
|
||||
wxMenuItem();
|
||||
|
||||
// accessors
|
||||
// id
|
||||
void SetId(int id) { m_id = id; }
|
||||
int GetId() const { return m_id; }
|
||||
bool IsSeparator() const { return m_id == ID_SEPARATOR; }
|
||||
// accessors
|
||||
// id
|
||||
void SetId(int id) { m_id = id; }
|
||||
int GetId() const { return m_id; }
|
||||
bool IsSeparator() const { return m_id == ID_SEPARATOR; }
|
||||
|
||||
// the item's text = name
|
||||
void SetName(const wxString& str);
|
||||
void SetText(const wxString& str) { SetName(str); } // compatibility
|
||||
const wxString& GetName() const { return m_text; }
|
||||
const wxString& GetText() const { return GetName(); }
|
||||
// the item's text = name
|
||||
void SetName(const wxString& str);
|
||||
void SetText(const wxString& str) { SetName(str); } // compatibility
|
||||
const wxString& GetName() const { return m_text; }
|
||||
const wxString& GetText() const { return GetName(); }
|
||||
|
||||
// what kind of menu item we are
|
||||
void SetCheckable(bool checkable) { m_isCheckMenu = checkable; }
|
||||
bool IsCheckable() const { return m_isCheckMenu; }
|
||||
void SetSubMenu(wxMenu *menu) { m_subMenu = menu; }
|
||||
wxMenu *GetSubMenu() const { return m_subMenu; }
|
||||
bool IsSubMenu() const { return m_subMenu != NULL; }
|
||||
// what kind of menu item we are
|
||||
void SetCheckable(bool checkable) { m_isCheckMenu = checkable; }
|
||||
bool IsCheckable() const { return m_isCheckMenu; }
|
||||
void SetSubMenu(wxMenu *menu) { m_subMenu = menu; }
|
||||
wxMenu *GetSubMenu() const { return m_subMenu; }
|
||||
bool IsSubMenu() const { return m_subMenu != NULL; }
|
||||
|
||||
// state
|
||||
void Enable( bool enable = TRUE );
|
||||
bool IsEnabled() const { return m_isEnabled; }
|
||||
void Check( bool check = TRUE );
|
||||
bool IsChecked() const;
|
||||
// state
|
||||
void Enable( bool enable = TRUE );
|
||||
bool IsEnabled() const { return m_isEnabled; }
|
||||
void Check( bool check = TRUE );
|
||||
bool IsChecked() const;
|
||||
|
||||
// help string (displayed in the status bar by default)
|
||||
void SetHelp(const wxString& str) { m_helpStr = str; }
|
||||
const wxString& GetHelp() const { return m_helpStr; }
|
||||
// help string (displayed in the status bar by default)
|
||||
void SetHelp(const wxString& str) { m_helpStr = str; }
|
||||
const wxString& GetHelp() const { return m_helpStr; }
|
||||
|
||||
// implementation
|
||||
|
||||
void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
|
||||
GtkWidget *GetMenuItem() const { return m_menuItem; }
|
||||
// implementation
|
||||
void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
|
||||
GtkWidget *GetMenuItem() const { return m_menuItem; }
|
||||
|
||||
int m_id;
|
||||
wxString m_text;
|
||||
bool m_isCheckMenu;
|
||||
bool m_isChecked;
|
||||
bool m_isEnabled;
|
||||
wxMenu *m_subMenu;
|
||||
wxString m_helpStr;
|
||||
void SetCheckedFlag(bool checked) { m_isChecked = checked; }
|
||||
bool GetCheckedFlag() const { return m_isChecked; }
|
||||
|
||||
GtkWidget *m_menuItem; // GtkMenuItem
|
||||
private:
|
||||
int m_id;
|
||||
wxString m_text;
|
||||
bool m_isCheckMenu;
|
||||
bool m_isChecked;
|
||||
bool m_isEnabled;
|
||||
wxMenu *m_subMenu;
|
||||
wxString m_helpStr;
|
||||
|
||||
GtkWidget *m_menuItem; // GtkMenuItem
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user