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:
Vadim Zeitlin
@@ -39,118 +39,148 @@ class wxMenu;
|
||||
// wxMenuBar
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxMenuBar: public wxWindow
|
||||
class wxMenuBar : public wxWindow
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxMenuBar)
|
||||
DECLARE_DYNAMIC_CLASS(wxMenuBar)
|
||||
|
||||
public:
|
||||
wxMenuBar( long style );
|
||||
wxMenuBar();
|
||||
void Append( wxMenu *menu, const wxString &title );
|
||||
// ctors
|
||||
wxMenuBar();
|
||||
wxMenuBar(long style);
|
||||
wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
|
||||
|
||||
int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
|
||||
wxMenuItem* FindMenuItemById( int id ) const;
|
||||
inline wxMenuItem* FindItemForId( int id ) const { return FindMenuItemById( id ); }
|
||||
|
||||
void Check( int id, bool check );
|
||||
bool Checked( int id ) const;
|
||||
void Enable( int id, bool enable );
|
||||
bool Enabled( int id ) const;
|
||||
inline bool IsEnabled( int id ) const { return Enabled(id); }
|
||||
inline bool IsChecked( int id ) const { return Checked(id); }
|
||||
|
||||
wxString GetLabel( int id ) const;
|
||||
void SetLabel( int id, const wxString &label );
|
||||
|
||||
void EnableTop( int pos, bool flag );
|
||||
void SetLabelTop( int pos, const wxString& label );
|
||||
wxString GetLabelTop( int pos ) const;
|
||||
// menubar construction
|
||||
void Append( wxMenu *menu, const wxString &title );
|
||||
|
||||
virtual void SetHelpString( int id, const wxString& helpString );
|
||||
virtual wxString GetHelpString( int id ) const;
|
||||
|
||||
inline int GetMenuCount() const { return m_menus.Number(); }
|
||||
inline wxMenu *GetMenu( int n ) const { return (wxMenu *)m_menus.Nth(n)->Data(); }
|
||||
// item search
|
||||
// by menu and item names, returns wxNOT_FOUND if not found
|
||||
virtual int FindMenuItem(const wxString& menuString,
|
||||
const wxString& itemString) const;
|
||||
// returns NULL if not found
|
||||
wxMenuItem* FindItem( int id ) const;
|
||||
// returns NULL if not found, fills menuForItem if !NULL
|
||||
wxMenuItem *FindItemForId(int itemId, wxMenu **menuForItem = NULL) const;
|
||||
|
||||
wxList m_menus;
|
||||
GtkWidget *m_menubar;
|
||||
// state control
|
||||
void Check( int id, bool check );
|
||||
bool IsChecked( int id ) const;
|
||||
void Enable( int id, bool enable );
|
||||
bool IsEnabled( int id ) const;
|
||||
|
||||
wxString GetLabel( int id ) const;
|
||||
void SetLabel( int id, const wxString &label );
|
||||
|
||||
void EnableTop( int pos, bool flag );
|
||||
void SetLabelTop( int pos, const wxString& label );
|
||||
wxString GetLabelTop( int pos ) const;
|
||||
|
||||
virtual void SetHelpString( int id, const wxString& helpString );
|
||||
virtual wxString GetHelpString( int id ) const;
|
||||
|
||||
int GetMenuCount() const { return m_menus.Number(); }
|
||||
wxMenu *GetMenu( int n ) const { return (wxMenu *)m_menus.Nth(n)->Data(); }
|
||||
|
||||
#ifdef WXWIN_COMPATIBILITY
|
||||
// compatibility: these functions are deprecated
|
||||
bool Enabled(int id) const { return IsEnabled(id); }
|
||||
bool Checked(int id) const { return IsChecked(id); }
|
||||
|
||||
wxMenuItem* FindMenuItemById( int id ) const { return FindItem(id); }
|
||||
#endif // WXWIN_COMPATIBILITY
|
||||
|
||||
// implementation
|
||||
wxList& GetMenus() { return m_menus; }
|
||||
|
||||
protected:
|
||||
wxList m_menus;
|
||||
GtkWidget *m_menubar;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxMenu
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxMenu: public wxEvtHandler
|
||||
class wxMenu : public wxEvtHandler
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxMenu)
|
||||
DECLARE_DYNAMIC_CLASS(wxMenu)
|
||||
|
||||
public:
|
||||
// construction
|
||||
wxMenu( const wxString& title = wxEmptyString, const wxFunction func = (wxFunction) NULL );
|
||||
// construction
|
||||
wxMenu( const wxString& title = wxEmptyString,
|
||||
const wxFunction func = (wxFunction) NULL );
|
||||
|
||||
// operations
|
||||
// title
|
||||
void SetTitle(const wxString& label);
|
||||
const wxString GetTitle() const;
|
||||
// menu creation
|
||||
void AppendSeparator();
|
||||
void Append(int id, const wxString &item,
|
||||
const wxString &helpStr = "", bool checkable = FALSE);
|
||||
void Append(int id, const wxString &item,
|
||||
wxMenu *subMenu, const wxString &helpStr = "" );
|
||||
void Append(wxMenuItem *pItem);
|
||||
void Break() {};
|
||||
// operations
|
||||
// title
|
||||
void SetTitle(const wxString& label);
|
||||
const wxString GetTitle() const;
|
||||
// menu creation
|
||||
void AppendSeparator();
|
||||
void Append(int id, const wxString &item,
|
||||
const wxString &helpStr = "", bool checkable = FALSE);
|
||||
void Append(int id, const wxString &item,
|
||||
wxMenu *subMenu, const wxString &helpStr = "" );
|
||||
void Append(wxMenuItem *pItem);
|
||||
void Break() { }
|
||||
|
||||
// find item by name/id
|
||||
int FindItem( const wxString itemString ) const;
|
||||
wxMenuItem *FindItem( int id ) const;
|
||||
wxMenuItem *FindItemForId( int id ) const { return FindItem( id ); }
|
||||
int FindItem( const wxString itemString ) const;
|
||||
wxMenuItem *FindItem( int id ) const;
|
||||
|
||||
// get/set item's state
|
||||
void Enable( int id, bool enable );
|
||||
bool IsEnabled( int id ) const;
|
||||
void Check( int id, bool check );
|
||||
bool IsChecked( int id ) const;
|
||||
void Enable( int id, bool enable );
|
||||
bool IsEnabled( int id ) const;
|
||||
void Check( int id, bool check );
|
||||
bool IsChecked( int id ) const;
|
||||
|
||||
void SetLabel( int id, const wxString &label );
|
||||
wxString GetLabel( int id ) const;
|
||||
void SetLabel( int id, const wxString &label );
|
||||
wxString GetLabel( int id ) const;
|
||||
|
||||
// helpstring
|
||||
virtual void SetHelpString(int id, const wxString& helpString);
|
||||
virtual wxString GetHelpString(int id) const ;
|
||||
|
||||
// accessors
|
||||
wxList& GetItems() { return m_items; }
|
||||
// helpstring
|
||||
virtual void SetHelpString(int id, const wxString& helpString);
|
||||
virtual wxString GetHelpString(int id) const ;
|
||||
|
||||
inline void Callback(const wxFunction func) { m_callback = func; }
|
||||
|
||||
inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
|
||||
inline wxEvtHandler *GetEventHandler() { return m_eventHandler; }
|
||||
|
||||
inline void SetClientData( void* clientData ) { m_clientData = clientData; }
|
||||
inline void* GetClientData() const { return m_clientData; }
|
||||
|
||||
// Updates the UI for a menu and all submenus recursively.
|
||||
// source is the object that has the update event handlers
|
||||
// defined for it. If NULL, the menu or associated window
|
||||
// will be used.
|
||||
void UpdateUI(wxEvtHandler* source = (wxEvtHandler*) NULL);
|
||||
// accessors
|
||||
wxList& GetItems() { return m_items; }
|
||||
|
||||
// implementation
|
||||
|
||||
int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
|
||||
void SetInvokingWindow( wxWindow *win );
|
||||
wxWindow *GetInvokingWindow();
|
||||
void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
|
||||
wxEvtHandler *GetEventHandler() { return m_eventHandler; }
|
||||
|
||||
wxString m_title;
|
||||
wxList m_items;
|
||||
wxWindow *m_invokingWindow;
|
||||
wxFunction m_callback;
|
||||
wxEvtHandler *m_eventHandler;
|
||||
void *m_clientData;
|
||||
void SetClientData( void* clientData ) { m_clientData = clientData; }
|
||||
void* GetClientData() const { return m_clientData; }
|
||||
|
||||
GtkWidget *m_menu; // GtkMenu
|
||||
GtkWidget *m_owner;
|
||||
// Updates the UI for a menu and all submenus recursively.
|
||||
// source is the object that has the update event handlers
|
||||
// defined for it. If NULL, the menu or associated window
|
||||
// will be used.
|
||||
void UpdateUI(wxEvtHandler* source = (wxEvtHandler*) NULL);
|
||||
|
||||
wxMenuItem *FindItemForId( int id ) const { return FindItem( id ); }
|
||||
|
||||
#ifdef WXWIN_COMPATIBILITY
|
||||
wxFunction GetCallback() const { return m_callback; }
|
||||
void Callback(const wxFunction func) { m_callback = func; }
|
||||
|
||||
// compatibility: these functions are deprecated
|
||||
bool Enabled(int id) const { return IsEnabled(id); }
|
||||
bool Checked(int id) const { return IsChecked(id); }
|
||||
#endif // WXWIN_COMPATIBILITY
|
||||
|
||||
// implementation
|
||||
int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
|
||||
void SetInvokingWindow( wxWindow *win );
|
||||
wxWindow *GetInvokingWindow();
|
||||
|
||||
// implementation only
|
||||
GtkWidget *m_menu; // GtkMenu
|
||||
GtkWidget *m_owner;
|
||||
|
||||
private:
|
||||
wxString m_title;
|
||||
wxList m_items;
|
||||
wxWindow *m_invokingWindow;
|
||||
wxFunction m_callback;
|
||||
wxEvtHandler *m_eventHandler;
|
||||
void *m_clientData;
|
||||
};
|
||||
|
||||
#endif // __GTKMENUH__
|
||||
|
||||
@@ -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