From c626a8b797d2819e1e14110d77c04a530fd3b6b4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 24 Mar 1999 19:05:19 +0000 Subject: [PATCH] wxMenu code clean up git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/menu.tex | 3 +- include/wx/gtk/menu.h | 222 ++++--- include/wx/gtk/menuitem.h | 96 +-- include/wx/gtk1/menu.h | 222 ++++--- include/wx/gtk1/menuitem.h | 96 +-- include/wx/msw/menu.h | 331 +++++---- include/wx/msw/menuitem.h | 6 +- src/gtk/frame.cpp | 7 +- src/gtk/mdi.cpp | 34 +- src/gtk/menu.cpp | 308 +++++---- src/gtk/window.cpp | 2 +- src/gtk1/frame.cpp | 7 +- src/gtk1/mdi.cpp | 34 +- src/gtk1/menu.cpp | 308 +++++---- src/gtk1/window.cpp | 2 +- src/msw/menu.cpp | 1290 +++++++++++++++++------------------- 16 files changed, 1535 insertions(+), 1433 deletions(-) diff --git a/docs/latex/wx/menu.tex b/docs/latex/wx/menu.tex index 4b670d93ac..9823528169 100644 --- a/docs/latex/wx/menu.tex +++ b/docs/latex/wx/menu.tex @@ -201,13 +201,14 @@ before matching. \membersection{wxMenu::FindItemForId}\label{wxmenufinditemforid} -\constfunc{wxMenuItem*}{FindItemForId}{\param{int}{ id}} +\constfunc{wxMenuItem*}{FindItemForId}{\param{int}{ id}, \param{wxMenu **}{ menuForItem = NULL}} Finds the menu item object associated with the given menu item identifier. \wxheading{Parameters} \docparam{id}{Menu item identifier.} +\docparam{menuForItem}{will be filled with the menu for this item if not NULL.} \wxheading{Return value} diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index 008be7e58a..e68ca22360 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -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 ); - - 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; - - 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(); } - - wxList m_menus; - GtkWidget *m_menubar; + // ctors + wxMenuBar(); + wxMenuBar(long style); + wxMenuBar(int n, wxMenu *menus[], const wxString titles[]); + + // menubar construction + void Append( wxMenu *menu, const wxString &title ); + + // 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; + + // 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 ); - - // 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() {}; + // 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() { } // 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 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; } - - 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); - -// implementation - - int FindMenuIdByMenuItem( GtkWidget *menuItem ) const; - void SetInvokingWindow( wxWindow *win ); - wxWindow *GetInvokingWindow(); - - wxString m_title; - wxList m_items; - wxWindow *m_invokingWindow; - wxFunction m_callback; - wxEvtHandler *m_eventHandler; - void *m_clientData; - - GtkWidget *m_menu; // GtkMenu - GtkWidget *m_owner; + 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; + + // helpstring + virtual void SetHelpString(int id, const wxString& helpString); + virtual wxString GetHelpString(int id) const ; + + // accessors + wxList& GetItems() { return m_items; } + + void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } + wxEvtHandler *GetEventHandler() { return m_eventHandler; } + + void SetClientData( void* clientData ) { m_clientData = clientData; } + 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); + + 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__ diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h index 446498063b..e84a48500c 100644 --- a/include/wx/gtk/menuitem.h +++ b/include/wx/gtk/menuitem.h @@ -28,63 +28,65 @@ //----------------------------------------------------------------------------- class wxMenuItem; - class wxMenu; //----------------------------------------------------------------------------- // wxMenuItem //----------------------------------------------------------------------------- -class wxMenuItem: public wxObject +class wxMenuItem : public wxObject { DECLARE_DYNAMIC_CLASS(wxMenuItem) public: - wxMenuItem(); - - // 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(); } - - // 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; - - // 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; } - - 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 + wxMenuItem(); + + // 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(); } + + // 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; + + // 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; } + + void SetCheckedFlag(bool checked) { m_isChecked = checked; } + bool GetCheckedFlag() const { return m_isChecked; } + +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 }; diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h index 008be7e58a..e68ca22360 100644 --- a/include/wx/gtk1/menu.h +++ b/include/wx/gtk1/menu.h @@ -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 ); - - 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; - - 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(); } - - wxList m_menus; - GtkWidget *m_menubar; + // ctors + wxMenuBar(); + wxMenuBar(long style); + wxMenuBar(int n, wxMenu *menus[], const wxString titles[]); + + // menubar construction + void Append( wxMenu *menu, const wxString &title ); + + // 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; + + // 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 ); - - // 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() {}; + // 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() { } // 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 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; } - - 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); - -// implementation - - int FindMenuIdByMenuItem( GtkWidget *menuItem ) const; - void SetInvokingWindow( wxWindow *win ); - wxWindow *GetInvokingWindow(); - - wxString m_title; - wxList m_items; - wxWindow *m_invokingWindow; - wxFunction m_callback; - wxEvtHandler *m_eventHandler; - void *m_clientData; - - GtkWidget *m_menu; // GtkMenu - GtkWidget *m_owner; + 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; + + // helpstring + virtual void SetHelpString(int id, const wxString& helpString); + virtual wxString GetHelpString(int id) const ; + + // accessors + wxList& GetItems() { return m_items; } + + void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } + wxEvtHandler *GetEventHandler() { return m_eventHandler; } + + void SetClientData( void* clientData ) { m_clientData = clientData; } + 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); + + 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__ diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h index 446498063b..e84a48500c 100644 --- a/include/wx/gtk1/menuitem.h +++ b/include/wx/gtk1/menuitem.h @@ -28,63 +28,65 @@ //----------------------------------------------------------------------------- class wxMenuItem; - class wxMenu; //----------------------------------------------------------------------------- // wxMenuItem //----------------------------------------------------------------------------- -class wxMenuItem: public wxObject +class wxMenuItem : public wxObject { DECLARE_DYNAMIC_CLASS(wxMenuItem) public: - wxMenuItem(); - - // 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(); } - - // 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; - - // 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; } - - 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 + wxMenuItem(); + + // 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(); } + + // 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; + + // 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; } + + void SetCheckedFlag(bool checked) { m_isChecked = checked; } + bool GetCheckedFlag() const { return m_isChecked; } + +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 }; diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h index 33c6701ca6..65479f5b20 100644 --- a/include/wx/msw/menu.h +++ b/include/wx/msw/menu.h @@ -13,7 +13,7 @@ #define _WX_MENU_H_ #ifdef __GNUG__ -#pragma interface "menu.h" + #pragma interface "menu.h" #endif #include "wx/defs.h" @@ -22,171 +22,212 @@ class WXDLLEXPORT wxMenuItem; class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxMenu; +class WXDLLEXPORT wxFrame; WXDLLEXPORT_DATA(extern const char*) wxEmptyString; // ---------------------------------------------------------------------------- // Menu // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenu: public wxEvtHandler + +class WXDLLEXPORT wxMenu : public wxEvtHandler { - DECLARE_DYNAMIC_CLASS(wxMenu) + DECLARE_DYNAMIC_CLASS(wxMenu) public: - // ctor & dtor - wxMenu(const wxString& title = wxEmptyString, const wxFunction func = NULL); - ~wxMenu(); - - // construct menu - // append items to the menu - // separator line - void AppendSeparator(); - // normal item - void Append(int id, const wxString& Label, const wxString& helpString = wxEmptyString, - bool checkable = FALSE); - // a submenu - void Append(int id, const wxString& Label, wxMenu *SubMenu, - const wxString& helpString = wxEmptyString); - // the most generic form (create wxMenuItem first and use it's functions) - void Append(wxMenuItem *pItem); - // insert a break in the menu - void Break(); - // delete an item - void Delete(int id); /* If it's a submenu, menu is not destroyed. VZ: why? */ - - // Client data - inline void SetClientData(void* clientData) { m_clientData = clientData; } - inline void* GetClientData() const { return m_clientData; } - - // menu item control - void Enable(int id, bool Flag); - bool Enabled(int id) const; - inline bool IsEnabled(int id) const { return Enabled(id); }; - void Check(int id, bool Flag); - bool Checked(int id) const; - inline bool IsChecked(int id) const { return Checked(id); }; - - // item properties - // title - void SetTitle(const wxString& label); - const wxString GetTitle() const; - // label - void SetLabel(int id, const wxString& label); - wxString GetLabel(int id) const; - // help string - virtual void SetHelpString(int id, const wxString& helpString); - virtual wxString GetHelpString(int id) const ; - - // find item - // Finds the item id matching the given string, wxNOT_FOUND if not found. - virtual int FindItem(const wxString& itemString) const ; - // Find wxMenuItem by ID, and item's menu too if itemMenu is !NULL. - wxMenuItem *FindItemForId(int itemId, wxMenu **itemMenu = NULL) const; - - // 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); - - void ProcessCommand(wxCommandEvent& event); - inline void Callback(const wxFunction func) { m_callback = func; } - - virtual void SetParent(wxEvtHandler *parent) { m_parent = parent; } - inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } - inline wxEvtHandler *GetEventHandler() { return m_eventHandler; } - - inline wxList& GetItems() const { return (wxList&) m_menuItems; } - - // IMPLEMENTATION - bool MSWCommand(WXUINT param, WXWORD id); - - void SetInvokingWindow(wxWindow *pWin) { m_pInvokingWindow = pWin; } - wxWindow *GetInvokingWindow() const { return m_pInvokingWindow; } - - // semi-private accessors - // get the window which contains this menu - wxWindow *GetWindow() const; - // get the menu handle - WXHMENU GetHMenu() const; + // ctor & dtor + wxMenu(const wxString& title = wxEmptyString, const wxFunction func = NULL); + virtual ~wxMenu(); + + // construct menu + // append a separator to the menu + void AppendSeparator(); + // append a normal item to the menu + void Append(int id, const wxString& label, + const wxString& helpString = wxEmptyString, + bool checkable = FALSE); + // append a submenu + void Append(int id, const wxString& label, + wxMenu *submenu, + const wxString& helpString = wxEmptyString); + // append anything (create wxMenuItem first) + void Append(wxMenuItem *pItem); + + // insert a break in the menu + void Break(); + + // delete an item + // If it's a submenu, menu is not destroyed. + // VZ: why? shouldn't it return "wxMenu *" then? + void Delete(int id); + + // client data + void SetClientData(void* clientData) { m_clientData = clientData; } + void* GetClientData() const { return m_clientData; } + + // menu item control + // enable/disable item + void Enable(int id, bool enable); + // TRUE if enabled + bool IsEnabled(int id) const; + + // check/uncheck item - only for checkable items, of course + void Check(int id, bool check); + // TRUE if checked + bool IsChecked(int id) const; + + // other properties + // the menu title + void SetTitle(const wxString& label); + const wxString GetTitle() const; + // the item label + void SetLabel(int id, const wxString& label); + wxString GetLabel(int id) const; + // help string + virtual void SetHelpString(int id, const wxString& helpString); + virtual wxString GetHelpString(int id) const; + + // get the list of items + wxList& GetItems() const { return (wxList &)m_menuItems; } + + // find item + // returns id of the item matching the given string or wxNOT_FOUND + virtual int FindItem(const wxString& itemString) const; + // returns NULL if not found + wxMenuItem* FindItem(int id) const { return FindItemForId(id); } + // find wxMenuItem by ID, and item's menu too if itemMenu is !NULL + wxMenuItem *FindItemForId(int itemId, wxMenu **itemMenu = NULL) const; + + // 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); + + void ProcessCommand(wxCommandEvent& event); + + virtual void SetParent(wxEvtHandler *parent) { m_parent = parent; } + void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } + wxEvtHandler *GetEventHandler() const { return m_eventHandler; } + +#ifdef WXWIN_COMPATIBILITY + 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 + bool MSWCommand(WXUINT param, WXWORD id); + + void SetInvokingWindow(wxWindow *pWin) { m_pInvokingWindow = pWin; } + wxWindow *GetInvokingWindow() const { return m_pInvokingWindow; } + + // semi-private accessors + // get the window which contains this menu + wxWindow *GetWindow() const; + // get the menu handle + WXHMENU GetHMenu() const; private: - bool m_doBreak ; + bool m_doBreak ; public: - // This is used when m_hMenu is NULL because we don't want to - // delete it in ~wxMenu (it's been added to a parent menu). - // But we'll still need the handle for other purposes. - // Might be better to have a flag saying whether it's deleteable or not. - WXHMENU m_savehMenu ; // Used for Enable() on popup - WXHMENU m_hMenu; - wxFunction m_callback; - - int m_noItems; - wxString m_title; - wxMenu * m_topLevelMenu; - wxMenuBar * m_menuBar; - wxList m_menuItems; - wxEvtHandler * m_parent; - wxEvtHandler * m_eventHandler; - wxWindow *m_pInvokingWindow; - void* m_clientData; + // This is used when m_hMenu is NULL because we don't want to + // delete it in ~wxMenu (it's been added to a parent menu). + // But we'll still need the handle for other purposes. + // Might be better to have a flag saying whether it's deleteable or not. + WXHMENU m_savehMenu ; // Used for Enable() on popup + WXHMENU m_hMenu; + wxFunction m_callback; + + int m_noItems; + wxString m_title; + wxMenu * m_topLevelMenu; + wxMenuBar * m_menuBar; + wxList m_menuItems; + wxEvtHandler * m_parent; + wxEvtHandler * m_eventHandler; + wxWindow *m_pInvokingWindow; + void* m_clientData; }; // ---------------------------------------------------------------------------- // Menu Bar (a la Windows) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFrame; -class WXDLLEXPORT wxMenuBar: public wxEvtHandler + +class WXDLLEXPORT wxMenuBar : public wxEvtHandler { - DECLARE_DYNAMIC_CLASS(wxMenuBar) + DECLARE_DYNAMIC_CLASS(wxMenuBar) + +public: + // ctors & dtor + wxMenuBar(); + wxMenuBar(long style); + wxMenuBar(int n, wxMenu *menus[], const wxString titles[]); + virtual ~wxMenuBar(); + + // menubar construction + void Append(wxMenu *menu, const wxString& title); + virtual void Delete(wxMenu *menu, int index = 0); /* Menu not destroyed */ + + // state control + // NB: must only be used AFTER menu has been attached to frame, + // otherwise use individual menus to enable/disable items + // enable the item + void Enable(int id, bool enable); + // TRUE if item enabled + bool IsEnabled(int id) const; + // + void EnableTop(int pos, bool enable); + + // works only with checkable items + void Check(int id, bool check); + // TRUE if checked + bool IsChecked(int id) const; + + void SetLabel(int id, const wxString& label) ; + wxString GetLabel(int id) const ; + + virtual void SetHelpString(int id, const wxString& helpString); + virtual wxString GetHelpString(int id) const ; + + void SetLabelTop(int pos, const wxString& label) ; + wxString GetLabelTop(int pos) const ; + + // notifications + virtual bool OnAppend(wxMenu *menu, const char *title); + virtual bool OnDelete(wxMenu *menu, int index); + + // 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 { return FindItemForId(id); } + // returns NULL if not found, fills menuForItem if !NULL + wxMenuItem *FindItemForId(int itemId, wxMenu **menuForItem = NULL) const; + + // submenus access + int GetMenuCount() const { return m_menuCount; } + wxMenu *GetMenu(int i) const { return m_menus[i]; } + + void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } + wxEvtHandler *GetEventHandler() { return m_eventHandler; } + +#ifdef WXWIN_COMPATIBILITY + // compatibility: these functions are deprecated + bool Enabled(int id) const { return IsEnabled(id); } + bool Checked(int id) const { return IsChecked(id); } +#endif // WXWIN_COMPATIBILITY public: - wxMenuBar(); - wxMenuBar( long style ); - wxMenuBar(int n, wxMenu *menus[], const wxString titles[]); - ~wxMenuBar(); - - void Append(wxMenu *menu, const wxString& title); - // Must only be used AFTER menu has been attached to frame, - // otherwise use individual menus to enable/disable items - void Enable(int Id, bool Flag); - bool Enabled(int Id) const ; - inline bool IsEnabled(int Id) const { return Enabled(Id); }; - void EnableTop(int pos, bool Flag); - void Check(int id, bool Flag); - bool Checked(int id) const ; - inline bool IsChecked(int Id) const { return Checked(Id); }; - void SetLabel(int id, const wxString& label) ; - wxString GetLabel(int id) const ; - void SetLabelTop(int pos, const wxString& label) ; - wxString GetLabelTop(int pos) const ; - virtual void Delete(wxMenu *menu, int index = 0); /* Menu not destroyed */ - virtual bool OnAppend(wxMenu *menu, const char *title); - virtual bool OnDelete(wxMenu *menu, int index); - - virtual void SetHelpString(int Id, const wxString& helpString); - virtual wxString GetHelpString(int Id) const ; - - virtual int FindMenuItem(const wxString& menuString, const wxString& itemString) const ; - - // Find wxMenuItem for item ID, and return item's - // menu too if itemMenu is non-NULL. - wxMenuItem *FindItemForId(int itemId, wxMenu **menuForItem = NULL) const ; - - inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } - inline wxEvtHandler *GetEventHandler() { return m_eventHandler; } - - inline int GetMenuCount() const { return m_menuCount; } - inline wxMenu* GetMenu(int i) const { return m_menus[i]; } - - public: - wxEvtHandler * m_eventHandler; - int m_menuCount; - wxMenu ** m_menus; - wxString * m_titles; - wxFrame * m_menuBarFrame; - WXHMENU m_hMenu; + wxEvtHandler * m_eventHandler; + int m_menuCount; + wxMenu ** m_menus; + wxString * m_titles; + wxFrame * m_menuBarFrame; + WXHMENU m_hMenu; }; #endif // _WX_MENU_H_ diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h index 9c912967f1..cbe61b535f 100644 --- a/include/wx/msw/menuitem.h +++ b/include/wx/msw/menuitem.h @@ -2,7 +2,7 @@ // 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 @@ -13,7 +13,7 @@ #define _MENUITEM_H #ifdef __GNUG__ -#pragma interface "menuitem.h" + #pragma interface "menuitem.h" #endif // ---------------------------------------------------------------------------- @@ -26,7 +26,7 @@ // headers - only because ownerdrw.h is not always included and I don't want // to write #ifdef's everywhere... #if wxUSE_OWNER_DRAWN -#include "wx/ownerdrw.h" + #include "wx/ownerdrw.h" #endif // ---------------------------------------------------------------------------- diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 18335cfef9..edd72807fe 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -514,7 +514,7 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( win ); - wxNode *node = menu->m_items.First(); + wxNode *node = menu->GetItems().First(); while (node) { wxMenuItem *menuitem = (wxMenuItem*)node->Data(); @@ -533,7 +533,7 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) if (m_frameMenuBar) { - wxNode *node = m_frameMenuBar->m_menus.First(); + wxNode *node = m_frameMenuBar->GetMenus().First(); while (node) { wxMenu *menu = (wxMenu*)node->Data(); @@ -548,7 +548,8 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y ); /* an mdi child menu bar might be underneath */ - if (m_mdiMenuBar) m_frameMenuBar->Show( FALSE ); + if (m_mdiMenuBar) + m_frameMenuBar->Show( FALSE ); } } diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index edfdec5641..e0b6d4aeca 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -124,7 +124,7 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height ) if (m_mdiMenuBar) { - m_mdiMenuBar->m_x = 0; + m_mdiMenuBar->m_x = 0; m_mdiMenuBar->m_y = 0; m_mdiMenuBar->m_width = m_width; m_mdiMenuBar->m_height = wxMENU_HEIGHT; @@ -137,13 +137,13 @@ void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar ) { /* hide old child menu bar */ if (m_mdiMenuBar) m_mdiMenuBar->Show( FALSE ); - + m_mdiMenuBar = menu_bar; - + /* show and resize new menu child menu bar */ if (m_mdiMenuBar) { - m_mdiMenuBar->m_x = 0; + m_mdiMenuBar->m_x = 0; m_mdiMenuBar->m_y = 0; m_mdiMenuBar->m_width = m_width; m_mdiMenuBar->m_height = wxMENU_HEIGHT; @@ -151,7 +151,7 @@ void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar ) gtk_widget_set_usize( m_mdiMenuBar->m_widget, m_width, wxMENU_HEIGHT ); m_mdiMenuBar->Show( TRUE ); } - + /* show/hide parent menu bar as required */ if (m_frameMenuBar) m_frameMenuBar->Show( (m_mdiMenuBar == NULL) ); } @@ -202,7 +202,7 @@ void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(eve //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame) - + BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame) EVT_ACTIVATE(wxMDIChildFrame::OnActivate) END_EVENT_TABLE() @@ -243,7 +243,7 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent, long style, const wxString& name ) { m_title = title; - + return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name ); } @@ -256,11 +256,11 @@ void wxMDIChildFrame::AddChild( wxWindow *child ) { wxWindow::AddChild( child ); } - + static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( win ); - wxNode *node = menu->m_items.First(); + wxNode *node = menu->GetItems().First(); while (node) { wxMenuItem *menuitem = (wxMenuItem*)node->Data(); @@ -280,7 +280,7 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) if (m_menuBar->m_parent != this) { - wxNode *node = m_menuBar->m_menus.First(); + wxNode *node = m_menuBar->GetMenus().First(); while (node) { wxMenu *menu = (wxMenu*)node->Data(); @@ -290,10 +290,10 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) m_menuBar->m_parent = mdi_frame; } - + gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_wxwindow), m_menuBar->m_widget, m_menuBar->m_x, m_menuBar->m_y ); - + mdi_frame->SetMDIMenuBar( m_menuBar ); } } @@ -325,15 +325,15 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate", GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child ); - + GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget); - + gtk_notebook_append_page( notebook, child->m_widget, label_widget ); child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data); gtk_notebook_set_page( notebook, parent->m_children.Number()-1 ); - + gtk_page_change_callback( (GtkNotebook *) NULL, child->m_page, 0, parent ); } @@ -359,7 +359,7 @@ wxMDIClientWindow::~wxMDIClientWindow(void) bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) { m_needParent = TRUE; - + m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI; PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" ); @@ -374,7 +374,7 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) m_parent->AddChild( this ); (m_parent->m_insertCallback)( m_parent, this ); - + PostCreation(); Show( TRUE ); diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 0c0d9b98a5..90abef6304 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -39,8 +39,8 @@ wxMenuBar::wxMenuBar( long style ) if (style & wxMB_DOCKABLE) { m_widget = gtk_handle_box_new(); - gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_menubar) ); - gtk_widget_show( GTK_WIDGET(m_menubar) ); + gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_menubar) ); + gtk_widget_show( GTK_WIDGET(m_menubar) ); } else { @@ -72,16 +72,19 @@ wxMenuBar::wxMenuBar() void wxMenuBar::Append( wxMenu *menu, const wxString &title ) { m_menus.Append( menu ); - menu->m_title = title; + wxString title2 = title; int pos; - do + do { - pos = menu->m_title.First( '&' ); - if (pos != -1) menu->m_title.Remove( pos, 1 ); - } while (pos != -1); + pos = title2.First( '&' ); + if (pos != wxNOT_FOUND) + title2.Remove( pos, 1 ); + } while (pos != wxNOT_FOUND); + + menu->SetTitle(title2); - menu->m_owner = gtk_menu_item_new_with_label( WXSTRINGCAST(menu->m_title) ); + menu->m_owner = gtk_menu_item_new_with_label( WXSTRINGCAST(title2) ); gtk_widget_show( menu->m_owner ); gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu ); @@ -90,13 +93,14 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title ) static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString ) { - if (menu->m_title == menuString) + if (menu->GetTitle() == menuString) { int res = menu->FindItem( itemString ); - if (res != -1) return res; + if (res != wxNOT_FOUND) + return res; } - - wxNode *node = menu->m_items.First(); + + wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast while (node) { wxMenuItem *item = (wxMenuItem*)node->Data(); @@ -106,7 +110,19 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString node = node->Next(); } - return -1; + return wxNOT_FOUND; +} + +wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem = NULL) const +{ + if ( menuForItem ) + { + // TODO return the pointer to the menu + + *menuForItem = NULL; + } + + return FindItem(itemId); } int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const @@ -122,26 +138,26 @@ int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemStr return -1; } -/* Find a wxMenuItem using its id. Recurses down into sub-menus */ +// Find a wxMenuItem using its id. Recurses down into sub-menus static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id) { wxMenuItem* result = menu->FindItem(id); - wxNode *node = menu->m_items.First(); - while ( node && result == NULL ) + wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast + while ( node && result == NULL ) { wxMenuItem *item = (wxMenuItem*)node->Data(); if (item->IsSubMenu()) - { + { result = FindMenuItemByIdRecursive( item->GetSubMenu(), id ); - } + } node = node->Next(); } return result; } -wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const +wxMenuItem* wxMenuBar::FindItem( int id ) const { wxMenuItem* result = 0; wxNode *node = m_menus.First(); @@ -151,101 +167,114 @@ wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const result = FindMenuItemByIdRecursive( menu, id ); node = node->Next(); } - + return result; } void wxMenuBar::Check( int id, bool check ) { wxMenuItem* item = FindMenuItemById( id ); - if (item) item->Check(check); + + wxCHECK_RET( item, "wxMenuBar::Check: no such item" ); + + item->Check(check); } -bool wxMenuBar::Checked( int id ) const +bool wxMenuBar::IsChecked( int id ) const { wxMenuItem* item = FindMenuItemById( id ); - if (item) return item->IsChecked(); - return FALSE; + + wxCHECK_MSG( item, FALSE, "wxMenuBar::IsChecked: no such item" ); + + return item->IsChecked(); } void wxMenuBar::Enable( int id, bool enable ) { wxMenuItem* item = FindMenuItemById( id ); - if (item) item->Enable(enable); + + wxCHECK_RET( item, "wxMenuBar::Enable: no such item" ); + + item->Enable(enable); } -bool wxMenuBar::Enabled( int id ) const +bool wxMenuBar::IsEnabled( int id ) const { wxMenuItem* item = FindMenuItemById( id ); - if (item) return item->IsEnabled(); - - return FALSE; + + wxCHECK_MSG( item, FALSE, "wxMenuBar::IsEnabled: no such item" ); + + return item->IsEnabled(); } wxString wxMenuBar::GetLabel( int id ) const { wxMenuItem* item = FindMenuItemById( id ); - - if (item) return item->GetText(); - - return wxString(""); + + wxCHECK_MSG( item, "", "wxMenuBar::GetLabel: no such item" ); + + return item->GetText(); } void wxMenuBar::SetLabel( int id, const wxString &label ) { wxMenuItem* item = FindMenuItemById( id ); - - if (item) item->SetText( label ); + + wxCHECK_RET( item, "wxMenuBar::SetLabel: no such item" ); + + item->SetText( label ); } void wxMenuBar::EnableTop( int pos, bool flag ) { wxNode *node = m_menus.Nth( pos ); - + wxCHECK_RET( node, "menu not found" ); - + wxMenu* menu = (wxMenu*)node->Data(); - - if (menu->m_owner) gtk_widget_set_sensitive( menu->m_owner, flag ); + + if (menu->m_owner) + gtk_widget_set_sensitive( menu->m_owner, flag ); } wxString wxMenuBar::GetLabelTop( int pos ) const { wxNode *node = m_menus.Nth( pos ); - + wxCHECK_MSG( node, "invalid", "menu not found" ); - + wxMenu* menu = (wxMenu*)node->Data(); - + return menu->GetTitle(); } void wxMenuBar::SetLabelTop( int pos, const wxString& label ) { wxNode *node = m_menus.Nth( pos ); - + wxCHECK_RET( node, "menu not found" ); - + wxMenu* menu = (wxMenu*)node->Data(); - + menu->SetTitle( label ); } void wxMenuBar::SetHelpString( int id, const wxString& helpString ) { wxMenuItem* item = FindMenuItemById( id ); - - if (item) item->SetHelp( helpString ); + + wxCHECK_RET( item, "wxMenuBar::SetHelpString: no such item" ); + + item->SetHelp( helpString ); } wxString wxMenuBar::GetHelpString( int id ) const { wxMenuItem* item = FindMenuItemById( id ); - - if (item) - return item->GetHelp(); - else - return wxString(""); + + wxCHECK_MSG( item, "", "wxMenuBar::GetHelpString: no such item" ); + + return item->GetHelp(); } //----------------------------------------------------------------------------- @@ -257,41 +286,44 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) int id = menu->FindMenuIdByMenuItem(widget); /* should find it for normal (not popup) menu */ - wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) ); + wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) ); - if (!menu->IsEnabled(id)) return; + if (!menu->IsEnabled(id)) + return; wxMenuItem* item = menu->FindItem( id ); wxCHECK_RET( item, "error in menu item callback" ); - - if (item->m_isCheckMenu) + + if (item->IsCheckable()) { - if (item->m_isChecked == item->IsChecked()) + if (item->GetCheckedFlag() == item->IsChecked()) { - /* the menu item has been checked by calling wxMenuItem->Check() */ + /* the menu item has been checked by calling wxMenuItem->Check() */ return; - } - else - { - /* the user pressed on the menu item -> report */ - item->m_isChecked = item->IsChecked(); /* make consistent again */ - } + } + else + { + /* the user pressed on the menu item -> report */ + item->SetCheckedFlag(item->IsChecked()); /* make consistent again */ + } } wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id ); event.SetEventObject( menu ); event.SetInt(id ); - if (menu->m_callback) + if (menu->GetCallback()) { - (void) (*(menu->m_callback)) (*menu, event); + (void) (*(menu->GetCallback())) (*menu, event); return; } - if (menu->GetEventHandler()->ProcessEvent(event)) return; + if (menu->GetEventHandler()->ProcessEvent(event)) + return; wxWindow *win = menu->GetInvokingWindow(); - if (win) win->GetEventHandler()->ProcessEvent( event ); + if (win) + win->GetEventHandler()->ProcessEvent( event ); } //----------------------------------------------------------------------------- @@ -304,7 +336,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) wxASSERT( id != -1 ); // should find it! - if (!menu->IsEnabled(id)) return; + if (!menu->IsEnabled(id)) + return; wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id ); event.SetEventObject( menu ); @@ -318,7 +351,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) } */ - if (menu->GetEventHandler()->ProcessEvent(event)) return; + if (menu->GetEventHandler()->ProcessEvent(event)) + return; wxWindow *win = menu->GetInvokingWindow(); if (win) win->GetEventHandler()->ProcessEvent( event ); @@ -334,15 +368,18 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) wxASSERT( id != -1 ); // should find it! - if (!menu->IsEnabled(id)) return; + if (!menu->IsEnabled(id)) + return; wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 ); event.SetEventObject( menu ); - if (menu->GetEventHandler()->ProcessEvent(event)) return; + if (menu->GetEventHandler()->ProcessEvent(event)) + return; wxWindow *win = menu->GetInvokingWindow(); - if (win) win->GetEventHandler()->ProcessEvent( event ); + if (win) + win->GetEventHandler()->ProcessEvent( event ); } //----------------------------------------------------------------------------- @@ -361,7 +398,7 @@ wxMenuItem::wxMenuItem() m_menuItem = (GtkWidget *) NULL; } -/* it's valid for this function to be called even if m_menuItem == NULL */ +// it's valid for this function to be called even if m_menuItem == NULL void wxMenuItem::SetName( const wxString& str ) { m_text = ""; @@ -432,13 +469,13 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func ) Append(-2, m_title); AppendSeparator(); } - + m_owner = (GtkWidget*) NULL; } void wxMenu::SetTitle( const wxString& title ) { - /* Waiting for something better. */ + // TODO Waiting for something better m_title = title; } @@ -517,14 +554,14 @@ void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxStri void wxMenu::Append( wxMenuItem *item ) { m_items.Append( item ); - + GtkWidget *menuItem = (GtkWidget*) NULL; - if (item->IsSeparator()) + if (item->IsSeparator()) menuItem = gtk_menu_item_new(); - else if (item->IsSubMenu()) + else if (item->IsSubMenu()) menuItem = gtk_menu_item_new_with_label(item->GetText()); - else + else menuItem = item->IsCheckable() ? gtk_check_menu_item_new_with_label(item->GetText()) : gtk_menu_item_new_with_label(item->GetText()); @@ -537,15 +574,15 @@ void wxMenu::Append( wxMenuItem *item ) gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), (gpointer*)this ); - - if (!item->IsSubMenu()) - { + + if (!item->IsSubMenu()) + { gtk_signal_connect( GTK_OBJECT(menuItem), "activate", GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), (gpointer*)this ); - } + } } - + gtk_menu_append( GTK_MENU(m_menu), menuItem ); gtk_widget_show( menuItem ); item->SetMenuItem(menuItem); @@ -556,7 +593,7 @@ int wxMenu::FindItem( const wxString itemString ) const wxString s( itemString ); int pos; - do + do { pos = s.First( '&' ); if (pos != -1) s.Remove( pos, 1 ); @@ -567,98 +604,85 @@ int wxMenu::FindItem( const wxString itemString ) const { wxMenuItem *item = (wxMenuItem*)node->Data(); if (item->GetText() == s) - { + { return item->GetId(); - } + } node = node->Next(); } - return -1; + return wxNOT_FOUND; } void wxMenu::Enable( int id, bool enable ) { wxMenuItem *item = FindItem(id); - if (item) - { - item->Enable(enable); - } + + wxCHECK_RET( item, "wxMenu::Enable: no such item" ); + + item->Enable(enable); } bool wxMenu::IsEnabled( int id ) const { wxMenuItem *item = FindItem(id); - if (item) - { - return item->IsEnabled(); - } - else - { - return FALSE; - } + + wxCHECK_MSG( item, FALSE, "wxMenu::IsEnabled: no such item" ); + + return item->IsEnabled(); } void wxMenu::Check( int id, bool enable ) { wxMenuItem *item = FindItem(id); - if (item) - { - item->Check(enable); - } + + wxCHECK_RET( item, "wxMenu::Check: no such item" ); + + item->Check(enable); } bool wxMenu::IsChecked( int id ) const { wxMenuItem *item = FindItem(id); - if (item) - { - return item->IsChecked(); - } - else - { - return FALSE; - } + + wxCHECK_MSG( item, FALSE, "wxMenu::IsChecked: no such item" ); + + return item->IsChecked(); } void wxMenu::SetLabel( int id, const wxString &label ) { wxMenuItem *item = FindItem(id); - if (item) - { - item->SetText(label); - } + + wxCHECK_RET( item, "wxMenu::SetLabel: no such item" ); + + item->SetText(label); } wxString wxMenu::GetLabel( int id ) const { wxMenuItem *item = FindItem(id); - if (item) - { - return item->GetText(); - } - else - { - return ""; - } + + wxCHECK_MSG( item, "", "wxMenu::GetLabel: no such item" ); + + return item->GetText(); } void wxMenu::SetHelpString( int id, const wxString& helpString ) { wxMenuItem *item = FindItem(id); - if (item) item->SetHelp( helpString ); + + wxCHECK_RET( item, "wxMenu::SetHelpString: no such item" ); + + item->SetHelp( helpString ); } wxString wxMenu::GetHelpString( int id ) const { wxMenuItem *item = FindItem(id); - if (item) - { - return item->GetHelp(); - } - else - { - return ""; - } + + wxCHECK_MSG( item, "", "wxMenu::GetHelpString: no such item" ); + + return item->GetHelp(); } int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const @@ -672,19 +696,19 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const node = node->Next(); } - return -1; + return wxNOT_FOUND; } wxMenuItem *wxMenu::FindItem(int id) const { wxNode *node = m_items.First(); - while (node) + while (node) { wxMenuItem *item = (wxMenuItem*)node->Data(); if (item->GetId() == id) - { + { return item; - } + } node = node->Next(); } @@ -705,10 +729,9 @@ wxWindow *wxMenu::GetInvokingWindow() return m_invokingWindow; } -// Update 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. +// Update 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 wxMenu::UpdateUI(wxEvtHandler* source) { if (!source && GetInvokingWindow()) @@ -745,4 +768,3 @@ void wxMenu::UpdateUI(wxEvtHandler* source) } } - diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 89b75f8a9d..26dabd6d51 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2750,7 +2750,7 @@ void wxWindow::InitDialog() static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( win ); - wxNode *node = menu->m_items.First(); + wxNode *node = menu->GetItems().First(); while (node) { wxMenuItem *menuitem = (wxMenuItem*)node->Data(); diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 18335cfef9..edd72807fe 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -514,7 +514,7 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( win ); - wxNode *node = menu->m_items.First(); + wxNode *node = menu->GetItems().First(); while (node) { wxMenuItem *menuitem = (wxMenuItem*)node->Data(); @@ -533,7 +533,7 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) if (m_frameMenuBar) { - wxNode *node = m_frameMenuBar->m_menus.First(); + wxNode *node = m_frameMenuBar->GetMenus().First(); while (node) { wxMenu *menu = (wxMenu*)node->Data(); @@ -548,7 +548,8 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y ); /* an mdi child menu bar might be underneath */ - if (m_mdiMenuBar) m_frameMenuBar->Show( FALSE ); + if (m_mdiMenuBar) + m_frameMenuBar->Show( FALSE ); } } diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp index edfdec5641..e0b6d4aeca 100644 --- a/src/gtk1/mdi.cpp +++ b/src/gtk1/mdi.cpp @@ -124,7 +124,7 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height ) if (m_mdiMenuBar) { - m_mdiMenuBar->m_x = 0; + m_mdiMenuBar->m_x = 0; m_mdiMenuBar->m_y = 0; m_mdiMenuBar->m_width = m_width; m_mdiMenuBar->m_height = wxMENU_HEIGHT; @@ -137,13 +137,13 @@ void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar ) { /* hide old child menu bar */ if (m_mdiMenuBar) m_mdiMenuBar->Show( FALSE ); - + m_mdiMenuBar = menu_bar; - + /* show and resize new menu child menu bar */ if (m_mdiMenuBar) { - m_mdiMenuBar->m_x = 0; + m_mdiMenuBar->m_x = 0; m_mdiMenuBar->m_y = 0; m_mdiMenuBar->m_width = m_width; m_mdiMenuBar->m_height = wxMENU_HEIGHT; @@ -151,7 +151,7 @@ void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar ) gtk_widget_set_usize( m_mdiMenuBar->m_widget, m_width, wxMENU_HEIGHT ); m_mdiMenuBar->Show( TRUE ); } - + /* show/hide parent menu bar as required */ if (m_frameMenuBar) m_frameMenuBar->Show( (m_mdiMenuBar == NULL) ); } @@ -202,7 +202,7 @@ void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(eve //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame) - + BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame) EVT_ACTIVATE(wxMDIChildFrame::OnActivate) END_EVENT_TABLE() @@ -243,7 +243,7 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent, long style, const wxString& name ) { m_title = title; - + return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name ); } @@ -256,11 +256,11 @@ void wxMDIChildFrame::AddChild( wxWindow *child ) { wxWindow::AddChild( child ); } - + static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( win ); - wxNode *node = menu->m_items.First(); + wxNode *node = menu->GetItems().First(); while (node) { wxMenuItem *menuitem = (wxMenuItem*)node->Data(); @@ -280,7 +280,7 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) if (m_menuBar->m_parent != this) { - wxNode *node = m_menuBar->m_menus.First(); + wxNode *node = m_menuBar->GetMenus().First(); while (node) { wxMenu *menu = (wxMenu*)node->Data(); @@ -290,10 +290,10 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) m_menuBar->m_parent = mdi_frame; } - + gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_wxwindow), m_menuBar->m_widget, m_menuBar->m_x, m_menuBar->m_y ); - + mdi_frame->SetMDIMenuBar( m_menuBar ); } } @@ -325,15 +325,15 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate", GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child ); - + GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget); - + gtk_notebook_append_page( notebook, child->m_widget, label_widget ); child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data); gtk_notebook_set_page( notebook, parent->m_children.Number()-1 ); - + gtk_page_change_callback( (GtkNotebook *) NULL, child->m_page, 0, parent ); } @@ -359,7 +359,7 @@ wxMDIClientWindow::~wxMDIClientWindow(void) bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) { m_needParent = TRUE; - + m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI; PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" ); @@ -374,7 +374,7 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) m_parent->AddChild( this ); (m_parent->m_insertCallback)( m_parent, this ); - + PostCreation(); Show( TRUE ); diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index 0c0d9b98a5..90abef6304 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -39,8 +39,8 @@ wxMenuBar::wxMenuBar( long style ) if (style & wxMB_DOCKABLE) { m_widget = gtk_handle_box_new(); - gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_menubar) ); - gtk_widget_show( GTK_WIDGET(m_menubar) ); + gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_menubar) ); + gtk_widget_show( GTK_WIDGET(m_menubar) ); } else { @@ -72,16 +72,19 @@ wxMenuBar::wxMenuBar() void wxMenuBar::Append( wxMenu *menu, const wxString &title ) { m_menus.Append( menu ); - menu->m_title = title; + wxString title2 = title; int pos; - do + do { - pos = menu->m_title.First( '&' ); - if (pos != -1) menu->m_title.Remove( pos, 1 ); - } while (pos != -1); + pos = title2.First( '&' ); + if (pos != wxNOT_FOUND) + title2.Remove( pos, 1 ); + } while (pos != wxNOT_FOUND); + + menu->SetTitle(title2); - menu->m_owner = gtk_menu_item_new_with_label( WXSTRINGCAST(menu->m_title) ); + menu->m_owner = gtk_menu_item_new_with_label( WXSTRINGCAST(title2) ); gtk_widget_show( menu->m_owner ); gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu ); @@ -90,13 +93,14 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title ) static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString ) { - if (menu->m_title == menuString) + if (menu->GetTitle() == menuString) { int res = menu->FindItem( itemString ); - if (res != -1) return res; + if (res != wxNOT_FOUND) + return res; } - - wxNode *node = menu->m_items.First(); + + wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast while (node) { wxMenuItem *item = (wxMenuItem*)node->Data(); @@ -106,7 +110,19 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString node = node->Next(); } - return -1; + return wxNOT_FOUND; +} + +wxMenuItem *wxMenuBar::FindItemForId(int itemId, wxMenu **menuForItem = NULL) const +{ + if ( menuForItem ) + { + // TODO return the pointer to the menu + + *menuForItem = NULL; + } + + return FindItem(itemId); } int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const @@ -122,26 +138,26 @@ int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemStr return -1; } -/* Find a wxMenuItem using its id. Recurses down into sub-menus */ +// Find a wxMenuItem using its id. Recurses down into sub-menus static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id) { wxMenuItem* result = menu->FindItem(id); - wxNode *node = menu->m_items.First(); - while ( node && result == NULL ) + wxNode *node = ((wxMenu *)menu)->GetItems().First(); // const_cast + while ( node && result == NULL ) { wxMenuItem *item = (wxMenuItem*)node->Data(); if (item->IsSubMenu()) - { + { result = FindMenuItemByIdRecursive( item->GetSubMenu(), id ); - } + } node = node->Next(); } return result; } -wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const +wxMenuItem* wxMenuBar::FindItem( int id ) const { wxMenuItem* result = 0; wxNode *node = m_menus.First(); @@ -151,101 +167,114 @@ wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const result = FindMenuItemByIdRecursive( menu, id ); node = node->Next(); } - + return result; } void wxMenuBar::Check( int id, bool check ) { wxMenuItem* item = FindMenuItemById( id ); - if (item) item->Check(check); + + wxCHECK_RET( item, "wxMenuBar::Check: no such item" ); + + item->Check(check); } -bool wxMenuBar::Checked( int id ) const +bool wxMenuBar::IsChecked( int id ) const { wxMenuItem* item = FindMenuItemById( id ); - if (item) return item->IsChecked(); - return FALSE; + + wxCHECK_MSG( item, FALSE, "wxMenuBar::IsChecked: no such item" ); + + return item->IsChecked(); } void wxMenuBar::Enable( int id, bool enable ) { wxMenuItem* item = FindMenuItemById( id ); - if (item) item->Enable(enable); + + wxCHECK_RET( item, "wxMenuBar::Enable: no such item" ); + + item->Enable(enable); } -bool wxMenuBar::Enabled( int id ) const +bool wxMenuBar::IsEnabled( int id ) const { wxMenuItem* item = FindMenuItemById( id ); - if (item) return item->IsEnabled(); - - return FALSE; + + wxCHECK_MSG( item, FALSE, "wxMenuBar::IsEnabled: no such item" ); + + return item->IsEnabled(); } wxString wxMenuBar::GetLabel( int id ) const { wxMenuItem* item = FindMenuItemById( id ); - - if (item) return item->GetText(); - - return wxString(""); + + wxCHECK_MSG( item, "", "wxMenuBar::GetLabel: no such item" ); + + return item->GetText(); } void wxMenuBar::SetLabel( int id, const wxString &label ) { wxMenuItem* item = FindMenuItemById( id ); - - if (item) item->SetText( label ); + + wxCHECK_RET( item, "wxMenuBar::SetLabel: no such item" ); + + item->SetText( label ); } void wxMenuBar::EnableTop( int pos, bool flag ) { wxNode *node = m_menus.Nth( pos ); - + wxCHECK_RET( node, "menu not found" ); - + wxMenu* menu = (wxMenu*)node->Data(); - - if (menu->m_owner) gtk_widget_set_sensitive( menu->m_owner, flag ); + + if (menu->m_owner) + gtk_widget_set_sensitive( menu->m_owner, flag ); } wxString wxMenuBar::GetLabelTop( int pos ) const { wxNode *node = m_menus.Nth( pos ); - + wxCHECK_MSG( node, "invalid", "menu not found" ); - + wxMenu* menu = (wxMenu*)node->Data(); - + return menu->GetTitle(); } void wxMenuBar::SetLabelTop( int pos, const wxString& label ) { wxNode *node = m_menus.Nth( pos ); - + wxCHECK_RET( node, "menu not found" ); - + wxMenu* menu = (wxMenu*)node->Data(); - + menu->SetTitle( label ); } void wxMenuBar::SetHelpString( int id, const wxString& helpString ) { wxMenuItem* item = FindMenuItemById( id ); - - if (item) item->SetHelp( helpString ); + + wxCHECK_RET( item, "wxMenuBar::SetHelpString: no such item" ); + + item->SetHelp( helpString ); } wxString wxMenuBar::GetHelpString( int id ) const { wxMenuItem* item = FindMenuItemById( id ); - - if (item) - return item->GetHelp(); - else - return wxString(""); + + wxCHECK_MSG( item, "", "wxMenuBar::GetHelpString: no such item" ); + + return item->GetHelp(); } //----------------------------------------------------------------------------- @@ -257,41 +286,44 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) int id = menu->FindMenuIdByMenuItem(widget); /* should find it for normal (not popup) menu */ - wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) ); + wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) ); - if (!menu->IsEnabled(id)) return; + if (!menu->IsEnabled(id)) + return; wxMenuItem* item = menu->FindItem( id ); wxCHECK_RET( item, "error in menu item callback" ); - - if (item->m_isCheckMenu) + + if (item->IsCheckable()) { - if (item->m_isChecked == item->IsChecked()) + if (item->GetCheckedFlag() == item->IsChecked()) { - /* the menu item has been checked by calling wxMenuItem->Check() */ + /* the menu item has been checked by calling wxMenuItem->Check() */ return; - } - else - { - /* the user pressed on the menu item -> report */ - item->m_isChecked = item->IsChecked(); /* make consistent again */ - } + } + else + { + /* the user pressed on the menu item -> report */ + item->SetCheckedFlag(item->IsChecked()); /* make consistent again */ + } } wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id ); event.SetEventObject( menu ); event.SetInt(id ); - if (menu->m_callback) + if (menu->GetCallback()) { - (void) (*(menu->m_callback)) (*menu, event); + (void) (*(menu->GetCallback())) (*menu, event); return; } - if (menu->GetEventHandler()->ProcessEvent(event)) return; + if (menu->GetEventHandler()->ProcessEvent(event)) + return; wxWindow *win = menu->GetInvokingWindow(); - if (win) win->GetEventHandler()->ProcessEvent( event ); + if (win) + win->GetEventHandler()->ProcessEvent( event ); } //----------------------------------------------------------------------------- @@ -304,7 +336,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) wxASSERT( id != -1 ); // should find it! - if (!menu->IsEnabled(id)) return; + if (!menu->IsEnabled(id)) + return; wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id ); event.SetEventObject( menu ); @@ -318,7 +351,8 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu ) } */ - if (menu->GetEventHandler()->ProcessEvent(event)) return; + if (menu->GetEventHandler()->ProcessEvent(event)) + return; wxWindow *win = menu->GetInvokingWindow(); if (win) win->GetEventHandler()->ProcessEvent( event ); @@ -334,15 +368,18 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu ) wxASSERT( id != -1 ); // should find it! - if (!menu->IsEnabled(id)) return; + if (!menu->IsEnabled(id)) + return; wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 ); event.SetEventObject( menu ); - if (menu->GetEventHandler()->ProcessEvent(event)) return; + if (menu->GetEventHandler()->ProcessEvent(event)) + return; wxWindow *win = menu->GetInvokingWindow(); - if (win) win->GetEventHandler()->ProcessEvent( event ); + if (win) + win->GetEventHandler()->ProcessEvent( event ); } //----------------------------------------------------------------------------- @@ -361,7 +398,7 @@ wxMenuItem::wxMenuItem() m_menuItem = (GtkWidget *) NULL; } -/* it's valid for this function to be called even if m_menuItem == NULL */ +// it's valid for this function to be called even if m_menuItem == NULL void wxMenuItem::SetName( const wxString& str ) { m_text = ""; @@ -432,13 +469,13 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func ) Append(-2, m_title); AppendSeparator(); } - + m_owner = (GtkWidget*) NULL; } void wxMenu::SetTitle( const wxString& title ) { - /* Waiting for something better. */ + // TODO Waiting for something better m_title = title; } @@ -517,14 +554,14 @@ void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxStri void wxMenu::Append( wxMenuItem *item ) { m_items.Append( item ); - + GtkWidget *menuItem = (GtkWidget*) NULL; - if (item->IsSeparator()) + if (item->IsSeparator()) menuItem = gtk_menu_item_new(); - else if (item->IsSubMenu()) + else if (item->IsSubMenu()) menuItem = gtk_menu_item_new_with_label(item->GetText()); - else + else menuItem = item->IsCheckable() ? gtk_check_menu_item_new_with_label(item->GetText()) : gtk_menu_item_new_with_label(item->GetText()); @@ -537,15 +574,15 @@ void wxMenu::Append( wxMenuItem *item ) gtk_signal_connect( GTK_OBJECT(menuItem), "deselect", GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), (gpointer*)this ); - - if (!item->IsSubMenu()) - { + + if (!item->IsSubMenu()) + { gtk_signal_connect( GTK_OBJECT(menuItem), "activate", GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), (gpointer*)this ); - } + } } - + gtk_menu_append( GTK_MENU(m_menu), menuItem ); gtk_widget_show( menuItem ); item->SetMenuItem(menuItem); @@ -556,7 +593,7 @@ int wxMenu::FindItem( const wxString itemString ) const wxString s( itemString ); int pos; - do + do { pos = s.First( '&' ); if (pos != -1) s.Remove( pos, 1 ); @@ -567,98 +604,85 @@ int wxMenu::FindItem( const wxString itemString ) const { wxMenuItem *item = (wxMenuItem*)node->Data(); if (item->GetText() == s) - { + { return item->GetId(); - } + } node = node->Next(); } - return -1; + return wxNOT_FOUND; } void wxMenu::Enable( int id, bool enable ) { wxMenuItem *item = FindItem(id); - if (item) - { - item->Enable(enable); - } + + wxCHECK_RET( item, "wxMenu::Enable: no such item" ); + + item->Enable(enable); } bool wxMenu::IsEnabled( int id ) const { wxMenuItem *item = FindItem(id); - if (item) - { - return item->IsEnabled(); - } - else - { - return FALSE; - } + + wxCHECK_MSG( item, FALSE, "wxMenu::IsEnabled: no such item" ); + + return item->IsEnabled(); } void wxMenu::Check( int id, bool enable ) { wxMenuItem *item = FindItem(id); - if (item) - { - item->Check(enable); - } + + wxCHECK_RET( item, "wxMenu::Check: no such item" ); + + item->Check(enable); } bool wxMenu::IsChecked( int id ) const { wxMenuItem *item = FindItem(id); - if (item) - { - return item->IsChecked(); - } - else - { - return FALSE; - } + + wxCHECK_MSG( item, FALSE, "wxMenu::IsChecked: no such item" ); + + return item->IsChecked(); } void wxMenu::SetLabel( int id, const wxString &label ) { wxMenuItem *item = FindItem(id); - if (item) - { - item->SetText(label); - } + + wxCHECK_RET( item, "wxMenu::SetLabel: no such item" ); + + item->SetText(label); } wxString wxMenu::GetLabel( int id ) const { wxMenuItem *item = FindItem(id); - if (item) - { - return item->GetText(); - } - else - { - return ""; - } + + wxCHECK_MSG( item, "", "wxMenu::GetLabel: no such item" ); + + return item->GetText(); } void wxMenu::SetHelpString( int id, const wxString& helpString ) { wxMenuItem *item = FindItem(id); - if (item) item->SetHelp( helpString ); + + wxCHECK_RET( item, "wxMenu::SetHelpString: no such item" ); + + item->SetHelp( helpString ); } wxString wxMenu::GetHelpString( int id ) const { wxMenuItem *item = FindItem(id); - if (item) - { - return item->GetHelp(); - } - else - { - return ""; - } + + wxCHECK_MSG( item, "", "wxMenu::GetHelpString: no such item" ); + + return item->GetHelp(); } int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const @@ -672,19 +696,19 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const node = node->Next(); } - return -1; + return wxNOT_FOUND; } wxMenuItem *wxMenu::FindItem(int id) const { wxNode *node = m_items.First(); - while (node) + while (node) { wxMenuItem *item = (wxMenuItem*)node->Data(); if (item->GetId() == id) - { + { return item; - } + } node = node->Next(); } @@ -705,10 +729,9 @@ wxWindow *wxMenu::GetInvokingWindow() return m_invokingWindow; } -// Update 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. +// Update 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 wxMenu::UpdateUI(wxEvtHandler* source) { if (!source && GetInvokingWindow()) @@ -745,4 +768,3 @@ void wxMenu::UpdateUI(wxEvtHandler* source) } } - diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 89b75f8a9d..26dabd6d51 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -2750,7 +2750,7 @@ void wxWindow::InitDialog() static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( win ); - wxNode *node = menu->m_items.First(); + wxNode *node = menu->GetItems().First(); while (node) { wxMenuItem *menuitem = (wxMenuItem*)node->Data(); diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 77923bb06a..345e930578 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -6,28 +6,28 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "menu.h" + #pragma implementation "menu.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/frame.h" -#include "wx/menu.h" -#include "wx/utils.h" + #include "wx/frame.h" + #include "wx/menu.h" + #include "wx/utils.h" #endif #if wxUSE_OWNER_DRAWN - #include "wx/ownerdrw.h" + #include "wx/ownerdrw.h" #endif #include "wx/msw/private.h" @@ -36,9 +36,14 @@ #include "wx/log.h" // other standard headers -// ---------------------- #include +// ---------------------------------------------------------------------------- +// global variables +// ---------------------------------------------------------------------------- + +extern wxMenu *wxCurrentPopupMenu; + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -47,13 +52,17 @@ static const int idMenuTitle = -2; // ---------------------------------------------------------------------------- -// wxWindows macros +// macros // ---------------------------------------------------------------------------- + #if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) - IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) + IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) + IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) #endif +// convenience macro +#define GetHMENU() ((HMENU)GetHMenu()) + // ============================================================================ // implementation // ============================================================================ @@ -61,368 +70,349 @@ static const int idMenuTitle = -2; // Menus // Construct a menu with optional title (then use append) -wxMenu::wxMenu(const wxString& Title, const wxFunction func) -{ - m_title = Title; - m_parent = NULL; - m_eventHandler = this; - m_pInvokingWindow = NULL; - m_doBreak = FALSE ; - m_noItems = 0; - m_menuBar = NULL; - m_hMenu = (WXHMENU) CreatePopupMenu(); - m_savehMenu = 0 ; - m_topLevelMenu = this; - m_clientData = (void*) NULL; - - if (m_title != "") - { - Append(idMenuTitle, m_title) ; - AppendSeparator() ; - } +wxMenu::wxMenu(const wxString& title, const wxFunction func) + : m_title(title) +{ + m_parent = NULL; + m_eventHandler = this; + m_pInvokingWindow = NULL; + m_doBreak = FALSE ; + m_noItems = 0; + m_menuBar = NULL; + m_hMenu = (WXHMENU) CreatePopupMenu(); + m_savehMenu = 0 ; + m_topLevelMenu = this; + m_clientData = (void*) NULL; + + if ( !!m_title ) + { + Append(idMenuTitle, m_title) ; + AppendSeparator() ; + } - Callback(func); + Callback(func); } // The wxWindow destructor will take care of deleting the submenus. wxMenu::~wxMenu() { - if (m_hMenu) - DestroyMenu((HMENU) m_hMenu); - m_hMenu = 0; - - // Windows seems really bad on Menu de-allocation... - // After many try, here is what I do: RemoveMenu() will ensure - // that popup are "disconnected" from their parent; then call - // delete method on each child (which in turn do a recursive job), - // and finally, DestroyMenu() - // - // With that, BoundCheckers is happy, and no complaints... -/* - int N = 0 ; - if (m_hMenu) - N = GetMenuItemCount(m_hMenu); - int i; - for (i = N-1; i >= 0; i--) - RemoveMenu(m_hMenu, i, MF_BYPOSITION); -*/ - - // How is deleting submenus in this loop any different from deleting - // the submenus in the children list, via ~wxWindow ? - // I'll reinstate this deletion for now and remove addition - // from children list (which doesn't exist now) - // Julian 1/3/97 - wxNode *node = m_menuItems.First(); - while (node) - { - wxMenuItem *item = (wxMenuItem *)node->Data(); - - // Delete child menus. - // Beware: they must not be appended to children list!!! - // (because order of delete is significant) - if (item->GetSubMenu()) - item->DeleteSubMenu(); - - wxNode *next = node->Next(); - delete item; - delete node; - node = next; - } -/* - if (m_hMenu) - DestroyMenu(m_hMenu); - m_hMenu = 0; -*/ + if (m_hMenu) + DestroyMenu((HMENU) m_hMenu); + m_hMenu = 0; + + // Windows seems really bad on Menu de-allocation... + // After many try, here is what I do: RemoveMenu() will ensure + // that popup are "disconnected" from their parent; then call + // delete method on each child (which in turn do a recursive job), + // and finally, DestroyMenu() + // + // With that, BoundCheckers is happy, and no complaints... + /* + int N = 0 ; + if (m_hMenu) + N = GetMenuItemCount(m_hMenu); + int i; + for (i = N-1; i >= 0; i--) + RemoveMenu(m_hMenu, i, MF_BYPOSITION); + */ + + // How is deleting submenus in this loop any different from deleting + // the submenus in the children list, via ~wxWindow ? + // I'll reinstate this deletion for now and remove addition + // from children list (which doesn't exist now) + // Julian 1/3/97 + wxNode *node = m_menuItems.First(); + while (node) + { + wxMenuItem *item = (wxMenuItem *)node->Data(); + + // Delete child menus. + // Beware: they must not be appended to children list!!! + // (because order of delete is significant) + if (item->GetSubMenu()) + item->DeleteSubMenu(); + + wxNode *next = node->Next(); + delete item; + delete node; + node = next; + } + /* + if (m_hMenu) + DestroyMenu(m_hMenu); + m_hMenu = 0; + */ } void wxMenu::Break() { - m_doBreak = TRUE ; + m_doBreak = TRUE ; } // function appends a new item or submenu to the menu void wxMenu::Append(wxMenuItem *pItem) { - wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" ); + wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" ); - m_menuItems.Append(pItem); + m_menuItems.Append(pItem); - UINT flags = 0; - - if ( m_doBreak ) { - flags |= MF_MENUBREAK; - m_doBreak = FALSE; - } + UINT flags = 0; - if ( pItem->IsSeparator() ) { - flags |= MF_SEPARATOR; - } + if ( m_doBreak ) { + flags |= MF_MENUBREAK; + m_doBreak = FALSE; + } + + if ( pItem->IsSeparator() ) { + flags |= MF_SEPARATOR; + } - // id is the numeric id for normal menu items and HMENU for submenus - UINT id; - wxMenu *SubMenu = pItem->GetSubMenu(); - if ( SubMenu != NULL ) { - wxASSERT( SubMenu->m_hMenu != (WXHMENU) NULL ); + // id is the numeric id for normal menu items and HMENU for submenus + UINT id; + wxMenu *SubMenu = pItem->GetSubMenu(); + if ( SubMenu != NULL ) { + wxASSERT( SubMenu->m_hMenu != (WXHMENU) NULL ); - id = (UINT)SubMenu->m_hMenu; + id = (UINT)SubMenu->m_hMenu; - SubMenu->m_topLevelMenu = m_topLevelMenu; - SubMenu->m_parent = this; - SubMenu->m_savehMenu = (WXHMENU)id; - SubMenu->m_hMenu = 0; + SubMenu->m_topLevelMenu = m_topLevelMenu; + SubMenu->m_parent = this; + SubMenu->m_savehMenu = (WXHMENU)id; + SubMenu->m_hMenu = 0; - flags |= MF_POPUP; - } - else { - id = pItem->GetId(); - } + flags |= MF_POPUP; + } + else { + id = pItem->GetId(); + } - LPCSTR pData; + LPCSTR pData; #if wxUSE_OWNER_DRAWN - if ( pItem->IsOwnerDrawn() ) { // want to get {Measure|Draw}Item messages? - // item draws itself, pass pointer to it in data parameter - flags |= MF_OWNERDRAW; - pData = (LPCSTR)pItem; - } - else + if ( pItem->IsOwnerDrawn() ) { // want to get {Measure|Draw}Item messages? + // item draws itself, pass pointer to it in data parameter + flags |= MF_OWNERDRAW; + pData = (LPCSTR)pItem; + } + else #endif - { - // menu is just a normal string (passed in data parameter) - flags |= MF_STRING; - pData = pItem->GetName(); - } + { + // menu is just a normal string (passed in data parameter) + flags |= MF_STRING; + pData = pItem->GetName(); + } - // visually select the menu title - if ( id == idMenuTitle ) - { - // TODO use SetMenuItemInfo(MFS_DEFAULT) to put it in bold face - } + // visually select the menu title + if ( id == idMenuTitle ) + { + // TODO use SetMenuItemInfo(MFS_DEFAULT) to put it in bold face + } - HMENU hMenu = (HMENU)((m_hMenu == 0) ? m_savehMenu : m_hMenu); - if ( !AppendMenu(hMenu, flags, id, pData) ) - { - wxLogLastError("AppendMenu"); - } + if ( !AppendMenu(GetHMENU(), flags, id, pData) ) + { + wxLogLastError("AppendMenu"); + } - m_noItems++; + m_noItems++; } void wxMenu::AppendSeparator() { - Append(new wxMenuItem(this, ID_SEPARATOR)); + Append(new wxMenuItem(this, ID_SEPARATOR)); } // Pullright item -void wxMenu::Append(int Id, const wxString& label, wxMenu *SubMenu, - const wxString& helpString) +void wxMenu::Append(int Id, const wxString& label, + wxMenu *SubMenu, const wxString& helpString) { - Append(new wxMenuItem(this, Id, label, helpString, FALSE, SubMenu)); + Append(new wxMenuItem(this, Id, label, helpString, FALSE, SubMenu)); } // Ordinary menu item -void wxMenu::Append(int Id, const wxString& label, - const wxString& helpString, bool checkable) +void wxMenu::Append(int Id, const wxString& label, + const wxString& helpString, bool checkable) { - // 'checkable' parameter is useless for Windows. - Append(new wxMenuItem(this, Id, label, helpString, checkable)); + // 'checkable' parameter is useless for Windows. + Append(new wxMenuItem(this, Id, label, helpString, checkable)); } void wxMenu::Delete(int id) { - wxNode *node; - int pos; - HMENU menu; - - wxMenuItem *item = NULL; - for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) { - item = (wxMenuItem *)node->Data(); - if (item->GetId() == id) - break; - } - - if (!node) - return; - - menu = (HMENU)(m_hMenu ? m_hMenu : m_savehMenu); - - wxMenu *pSubMenu = item->GetSubMenu(); - if ( pSubMenu != NULL ) { - RemoveMenu(menu, (UINT)pos, MF_BYPOSITION); - pSubMenu->m_hMenu = pSubMenu->m_savehMenu; - pSubMenu->m_savehMenu = 0; - pSubMenu->m_parent = NULL; - // RemoveChild(item->subMenu); - pSubMenu->m_topLevelMenu = NULL; - // TODO: Why isn't subMenu deleted here??? - // Will put this in for now. Assuming this is supposed - // to delete the menu, not just remove it. - item->DeleteSubMenu(); - } - else { - DeleteMenu(menu, (UINT)pos, MF_BYPOSITION); - } - - m_menuItems.DeleteNode(node); - delete item; + wxMenuItem *item = NULL; + int pos; + wxNode *node; + for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) + { + item = (wxMenuItem *)node->Data(); + if ( item->GetId() == id ) + break; + } + + wxCHECK_RET( node, "wxMenu::Delete(): item doesn't exist" ); + + HMENU menu = GetHMENU(); + + wxMenu *pSubMenu = item->GetSubMenu(); + if ( pSubMenu != NULL ) { + RemoveMenu(menu, (UINT)pos, MF_BYPOSITION); + pSubMenu->m_hMenu = pSubMenu->m_savehMenu; + pSubMenu->m_savehMenu = 0; + pSubMenu->m_parent = NULL; + // RemoveChild(item->subMenu); + pSubMenu->m_topLevelMenu = NULL; + // TODO: Why isn't subMenu deleted here??? + // Will put this in for now. Assuming this is supposed + // to delete the menu, not just remove it. + item->DeleteSubMenu(); + } + else { + DeleteMenu(menu, (UINT)pos, MF_BYPOSITION); + } + + m_menuItems.DeleteNode(node); + delete item; } void wxMenu::Enable(int Id, bool Flag) { - wxMenuItem *item = FindItemForId(Id); - wxCHECK_RET( item != NULL, "can't enable non-existing menu item" ); + wxMenuItem *item = FindItemForId(Id); + wxCHECK_RET( item != NULL, "can't enable non-existing menu item" ); - item->Enable(Flag); + item->Enable(Flag); } -bool wxMenu::Enabled(int Id) const +bool wxMenu::IsEnabled(int Id) const { - wxMenuItem *item = FindItemForId(Id); - wxCHECK( item != NULL, FALSE ); + wxMenuItem *item = FindItemForId(Id); + wxCHECK( item != NULL, FALSE, "invalid item id" ); - return item->IsEnabled(); + return item->IsEnabled(); } void wxMenu::Check(int Id, bool Flag) { - wxMenuItem *item = FindItemForId(Id); - wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" ); + wxMenuItem *item = FindItemForId(Id); + wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" ); - item->Check(Flag); + item->Check(Flag); } -bool wxMenu::Checked(int Id) const +bool wxMenu::IsChecked(int Id) const { - wxMenuItem *item = FindItemForId(Id); - wxCHECK( item != NULL, FALSE ); + wxMenuItem *item = FindItemForId(Id); + wxCHECK( item != NULL, FALSE, "invalid item id" ); - return item->IsChecked(); + return item->IsChecked(); } void wxMenu::SetTitle(const wxString& label) { - bool hasNoTitle = m_title.IsEmpty(); - m_title = label; + bool hasNoTitle = m_title.IsEmpty(); + m_title = label; - HMENU hMenu = (HMENU)((m_hMenu == 0) ? m_savehMenu : m_hMenu); + HMENU hMenu = GetHMENU(); - if ( hasNoTitle ) - { - if ( !label.IsEmpty() ) - { - if ( !InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING, - (unsigned)idMenuTitle, m_title) || - !InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) ) - { - wxLogLastError("InsertMenu"); - } - } - } - else - { - if ( label.IsEmpty() ) + if ( hasNoTitle ) { - // remove the title and the separator after it - if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) || - !RemoveMenu(hMenu, 0, MF_BYPOSITION) ) - { - wxLogLastError("RemoveMenu"); - } + if ( !label.IsEmpty() ) + { + if ( !InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING, + (unsigned)idMenuTitle, m_title) || + !InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) ) + { + wxLogLastError("InsertMenu"); + } + } } else { - // modify the title - if ( !ModifyMenu(hMenu, 0u, - MF_BYPOSITION | MF_STRING, - (unsigned)idMenuTitle, m_title) ) - { - wxLogLastError("ModifyMenu"); - } + if ( label.IsEmpty() ) + { + // remove the title and the separator after it + if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) || + !RemoveMenu(hMenu, 0, MF_BYPOSITION) ) + { + wxLogLastError("RemoveMenu"); + } + } + else + { + // modify the title + if ( !ModifyMenu(hMenu, 0u, + MF_BYPOSITION | MF_STRING, + (unsigned)idMenuTitle, m_title) ) + { + wxLogLastError("ModifyMenu"); + } + } } - } #ifndef __WIN16__ - // put the title string in bold face - if ( !m_title.IsEmpty() ) - { - MENUITEMINFO mii; - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE; - mii.fState = MFS_DEFAULT; - - if ( !SetMenuItemInfo(hMenu, (unsigned)idMenuTitle, FALSE, &mii) ) + // put the title string in bold face + if ( !m_title.IsEmpty() ) { - wxLogLastError("SetMenuItemInfo"); + MENUITEMINFO mii; + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STATE; + mii.fState = MFS_DEFAULT; + + if ( !SetMenuItemInfo(hMenu, (unsigned)idMenuTitle, FALSE, &mii) ) + { + wxLogLastError("SetMenuItemInfo"); + } } - } #endif } const wxString wxMenu::GetTitle() const { - return m_title; + return m_title; } void wxMenu::SetLabel(int Id, const wxString& label) { - wxMenuItem *item = FindItemForId(Id) ; - if (item==NULL) - return; + wxMenuItem *item = FindItemForId(Id) ; + if (item==NULL) + return; - if (item->GetSubMenu()==NULL) - { - if (m_hMenu) + if (item->GetSubMenu()==NULL) { - UINT was_flag = GetMenuState((HMENU)m_hMenu,Id,MF_BYCOMMAND) ; - ModifyMenu((HMENU)m_hMenu,Id,MF_BYCOMMAND|MF_STRING|was_flag,Id,(const char *)label) ; + HMENU hMenu = GetHMENU(); + + UINT was_flag = GetMenuState(hMenu, Id, MF_BYCOMMAND); + ModifyMenu(hMenu, Id, MF_BYCOMMAND | MF_STRING | was_flag, Id, label); } - else if (m_savehMenu) - { - UINT was_flag = GetMenuState((HMENU)m_savehMenu,Id,MF_BYCOMMAND) ; - ModifyMenu((HMENU)m_savehMenu,Id,MF_BYCOMMAND|MF_STRING|was_flag,Id,(const char *)label) ; - } - } - else - { - wxMenu *father = item->GetSubMenu()->m_topLevelMenu ; - wxNode *node = father->m_menuItems.First() ; - int i = 0 ; - while (node) + else { - wxMenuItem *matched = (wxMenuItem*)node->Data() ; - if (matched==item) - break ; - i++ ; - node = node->Next() ; + wxMenu *father = item->GetSubMenu()->m_topLevelMenu ; + wxNode *node = father->m_menuItems.First() ; + int i = 0 ; + while (node) + { + wxMenuItem *matched = (wxMenuItem*)node->Data() ; + if (matched==item) + break ; + i++ ; + node = node->Next() ; + } + // Here, we have the position. + ModifyMenu((HMENU)father->m_savehMenu,i, + MF_BYPOSITION|MF_STRING|MF_POPUP, + (UINT)item->GetSubMenu()->m_savehMenu,(const char *)label) ; } - // Here, we have the position. - ModifyMenu((HMENU)father->m_savehMenu,i, - MF_BYPOSITION|MF_STRING|MF_POPUP, - (UINT)item->GetSubMenu()->m_savehMenu,(const char *)label) ; - } - item->SetName(label); + item->SetName(label); } wxString wxMenu::GetLabel(int id) const { -/* - static char tmp[128] ; - int len; - if (m_hMenu) - len = GetMenuString((HMENU)m_hMenu,Id,tmp,WXSIZEOF(tmp) - 1,MF_BYCOMMAND); - else if (m_savehMenu) - len = GetMenuString((HMENU)m_savehMenu,Id,tmp,WXSIZEOF(tmp) - 1,MF_BYCOMMAND); - else - len = 0 ; - tmp[len] = '\0' ; - return wxString(tmp) ; - -*/ + wxString label; wxMenuItem *pItem = FindItemForId(id) ; if (pItem) - return pItem->GetName() ; + label = pItem->GetName() ; else - return wxEmptyString; + wxFAIL_MSG("wxMenu::GetLabel: item doesn't exist"); + + return label; } bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id) @@ -445,573 +435,533 @@ bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id) // Finds the item id matching the given string, -1 if not found. int wxMenu::FindItem (const wxString& itemString) const { - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)itemString, buf1); + // FIXME fixed size buffer + char buf1[200]; + char buf2[200]; + wxStripMenuCodes ((char *)(const char *)itemString, buf1); - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) + for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) { - wxMenuItem *item = (wxMenuItem *) node->Data (); - if (item->GetSubMenu()) - { - int ans = item->GetSubMenu()->FindItem(itemString); - if (ans > -1) - return ans; - } - if ( !item->IsSeparator() ) - { - wxStripMenuCodes((char *)item->GetName().c_str(), buf2); - if (strcmp(buf1, buf2) == 0) - return item->GetId(); - } + wxMenuItem *item = (wxMenuItem *) node->Data (); + if (item->GetSubMenu()) + { + int ans = item->GetSubMenu()->FindItem(itemString); + if (ans > -1) + return ans; + } + if ( !item->IsSeparator() ) + { + wxStripMenuCodes((char *)item->GetName().c_str(), buf2); + if (strcmp(buf1, buf2) == 0) + return item->GetId(); + } } - return -1; + return wxNOT_FOUND; } wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const { - if (itemMenu) - *itemMenu = NULL; - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) - { - wxMenuItem *item = (wxMenuItem *) node->Data (); - - if (item->GetId() == itemId) + if (itemMenu) + *itemMenu = NULL; + for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) { - if (itemMenu) - *itemMenu = (wxMenu *) this; - return item; + wxMenuItem *item = (wxMenuItem *) node->Data (); + + if (item->GetId() == itemId) + { + if (itemMenu) + *itemMenu = (wxMenu *) this; + return item; + } + + if (item->GetSubMenu()) + { + wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu); + if (ans) + return ans; + } } - if (item->GetSubMenu()) - { - wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu); - if (ans) - return ans; - } - } - - if (itemMenu) - *itemMenu = NULL; - return NULL; + if (itemMenu) + *itemMenu = NULL; + return NULL; } void wxMenu::SetHelpString(int itemId, const wxString& helpString) { - wxMenuItem *item = FindItemForId (itemId); - if (item) - item->SetHelp(helpString); + wxMenuItem *item = FindItemForId (itemId); + if (item) + item->SetHelp(helpString); + else + wxFAIL_MSG("wxMenu::SetHelpString: item doesn't exist"); } wxString wxMenu::GetHelpString (int itemId) const { - wxMenuItem *item = FindItemForId (itemId); - if (item) - return item->GetHelp(); - else - return wxEmptyString; + wxString help; + wxMenuItem *item = FindItemForId (itemId); + if (item) + help = item->GetHelp(); + else + wxFAIL_MSG("wxMenu::GetHelpString: item doesn't exist"); + + return help; } void wxMenu::ProcessCommand(wxCommandEvent & event) { - bool processed = FALSE; + bool processed = FALSE; - // Try a callback - if (m_callback) - { - (void)(*(m_callback))(*this, event); - processed = TRUE; - } + // Try a callback + if (m_callback) + { + (void)(*(m_callback))(*this, event); + processed = TRUE; + } - // Try the menu's event handler - if ( !processed && GetEventHandler()) - { - processed = GetEventHandler()->ProcessEvent(event); - } + // Try the menu's event handler + if ( !processed && GetEventHandler()) + { + processed = GetEventHandler()->ProcessEvent(event); + } - // Try the window the menu was popped up from (and up - // through the hierarchy) - if ( !processed && GetInvokingWindow()) - processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event); + // Try the window the menu was popped up from (and up through the + // hierarchy) + wxWindow *win = GetInvokingWindow(); + if ( !processed && win ) + processed = win->GetEventHandler()->ProcessEvent(event); } -extern wxMenu *wxCurrentPopupMenu; bool wxWindow::PopupMenu(wxMenu *menu, int x, int y) { - menu->SetInvokingWindow(this); - menu->UpdateUI(); + menu->SetInvokingWindow(this); + menu->UpdateUI(); - HWND hWnd = (HWND) GetHWND(); - HMENU hMenu = (HMENU)menu->m_hMenu; - POINT point; - point.x = x; - point.y = y; - ::ClientToScreen(hWnd, &point); - wxCurrentPopupMenu = menu; - ::TrackPopupMenu(hMenu, TPM_RIGHTBUTTON, point.x, point.y, 0, hWnd, NULL); - wxYield(); - wxCurrentPopupMenu = NULL; + HWND hWnd = (HWND) GetHWND(); + HMENU hMenu = (HMENU)menu->m_hMenu; + POINT point; + point.x = x; + point.y = y; + ::ClientToScreen(hWnd, &point); + wxCurrentPopupMenu = menu; + ::TrackPopupMenu(hMenu, TPM_RIGHTBUTTON, point.x, point.y, 0, hWnd, NULL); + wxYield(); + wxCurrentPopupMenu = NULL; - menu->SetInvokingWindow(NULL); + menu->SetInvokingWindow(NULL); - return TRUE; + return TRUE; } // Menu Bar wxMenuBar::wxMenuBar() { - m_eventHandler = this; - m_menuCount = 0; - m_menus = NULL; - m_titles = NULL; - m_menuBarFrame = NULL; - m_hMenu = 0; + m_eventHandler = this; + m_menuCount = 0; + m_menus = NULL; + m_titles = NULL; + m_menuBarFrame = NULL; + m_hMenu = 0; } wxMenuBar::wxMenuBar( long WXUNUSED(style) ) { - m_eventHandler = this; - m_menuCount = 0; - m_menus = NULL; - m_titles = NULL; - m_menuBarFrame = NULL; - m_hMenu = 0; + m_eventHandler = this; + m_menuCount = 0; + m_menus = NULL; + m_titles = NULL; + m_menuBarFrame = NULL; + m_hMenu = 0; } wxMenuBar::wxMenuBar(int N, wxMenu *Menus[], const wxString Titles[]) { - m_eventHandler = this; - m_menuCount = N; - m_menus = Menus; - m_titles = new wxString[N]; - int i; - for ( i = 0; i < N; i++ ) - m_titles[i] = Titles[i]; - m_menuBarFrame = NULL; - for (i = 0; i < N; i++) - m_menus[i]->m_menuBar = (wxMenuBar *) this; + m_eventHandler = this; + m_menuCount = N; + m_menus = Menus; + m_titles = new wxString[N]; + int i; + for ( i = 0; i < N; i++ ) + m_titles[i] = Titles[i]; + m_menuBarFrame = NULL; + for (i = 0; i < N; i++) + m_menus[i]->m_menuBar = (wxMenuBar *) this; - m_hMenu = 0; + m_hMenu = 0; } wxMenuBar::~wxMenuBar() { - // In fact, don't want menu to be destroyed before MDI - // shuffling has taken place. Let it be destroyed - // automatically when the window is destroyed. + // In fact, don't want menu to be destroyed before MDI + // shuffling has taken place. Let it be destroyed + // automatically when the window is destroyed. -// DestroyMenu(menu); -// m_hMenu = NULL; + // DestroyMenu(menu); + // m_hMenu = NULL; - int i; -/* - // See remarks in ::~wxMenu() method - // BEWARE - this may interfere with MDI fixes, so - // may need to remove - int N = 0 ; + int i; + /* + // See remarks in ::~wxMenu() method + // BEWARE - this may interfere with MDI fixes, so + // may need to remove + int N = 0 ; - if (m_menuBarFrame && ((m_menuBarFrame->GetWindowStyleFlag() & wxSDI) == wxSDI)) - { + if (m_menuBarFrame && ((m_menuBarFrame->GetWindowStyleFlag() & wxSDI) == wxSDI)) + { if (menu) - N = GetMenuItemCount(menu) ; + N = GetMenuItemCount(menu) ; for (i = N-1; i >= 0; i--) - RemoveMenu(menu, i, MF_BYPOSITION); - } -*/ - for (i = 0; i < m_menuCount; i++) - { - delete m_menus[i]; - } - delete[] m_menus; - delete[] m_titles; - -/* Don't destroy menu here, in case we're MDI and - need to do some shuffling with VALID menu handles. - if (menu) - DestroyMenu(menu); - m_hMenu = 0; -*/ + RemoveMenu(menu, i, MF_BYPOSITION); + } + */ + for (i = 0; i < m_menuCount; i++) + { + delete m_menus[i]; + } + delete[] m_menus; + delete[] m_titles; + + /* Don't destroy menu here, in case we're MDI and + need to do some shuffling with VALID menu handles. + if (menu) + DestroyMenu(menu); + m_hMenu = 0; + */ } // Must only be used AFTER menu has been attached to frame, // otherwise use individual menus to enable/disable items -void wxMenuBar::Enable(int Id, bool Flag) +void wxMenuBar::Enable(int Id, bool enable) { - int ms_flag; - if (Flag) - ms_flag = MF_ENABLED; - else - ms_flag = MF_GRAYED; + int flag = enable ? MF_ENABLED : MF_GRAYED; - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - if (!item) - return; + wxMenu *itemMenu = NULL; + wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - if (itemMenu->m_hMenu) - EnableMenuItem((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND | ms_flag); - else if (itemMenu->m_savehMenu) - EnableMenuItem((HMENU)itemMenu->m_savehMenu, Id, MF_BYCOMMAND | ms_flag); + wxCHECK_RET( item, "attempt to enable an item which doesn't exist" ); + EnableMenuItem(GetHMENU(), Id, MF_BYCOMMAND | flag); } -void wxMenuBar::EnableTop(int pos, bool flag) +void wxMenuBar::EnableTop(int pos, bool enable) { - int ms_flag; - if (flag) - ms_flag = MF_ENABLED; - else - ms_flag = MF_GRAYED; + int flag = enable ? MF_ENABLED : MF_GRAYED;; - EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | ms_flag); - DrawMenuBar((HWND) m_menuBarFrame->GetHWND()) ; + EnableMenuItem((HMENU)m_hMenu, pos, MF_BYPOSITION | flag); + DrawMenuBar((HWND) m_menuBarFrame->GetHWND()) ; } // Must only be used AFTER menu has been attached to frame, // otherwise use individual menus -void wxMenuBar::Check(int Id, bool Flag) -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - if (!item) - return; - - if (!item->IsCheckable()) - return ; - int ms_flag; - if (Flag) - ms_flag = MF_CHECKED; - else - ms_flag = MF_UNCHECKED; - - if (itemMenu->m_hMenu) - CheckMenuItem((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND | ms_flag); - else if (itemMenu->m_savehMenu) - CheckMenuItem((HMENU)itemMenu->m_savehMenu, Id, MF_BYCOMMAND | ms_flag); - -// CheckMenuItem((HMENU)m_hMenu, Id, MF_BYCOMMAND | ms_flag); -} - -bool wxMenuBar::Checked(int Id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - if (!item) - return FALSE; +void wxMenuBar::Check(int Id, bool check) +{ + wxMenu *itemMenu = NULL; + wxMenuItem *item = FindItemForId(Id, &itemMenu) ; + + wxCHECK_RET( item, "attempt to check an item which doesn't exist" ); + wxCHECK_RET( item->IsCheckable(), "attempt to check an uncheckable item" ); - int Flag = 0; + int flag = check ? MF_CHECKED : MF_UNCHECKED; + CheckMenuItem(GetHMENU(), Id, MF_BYCOMMAND | flag); +} + +bool wxMenuBar::IsChecked(int Id) const +{ + wxMenu *itemMenu = NULL; + wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - if (itemMenu->m_hMenu) - Flag=GetMenuState((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND) ; - else if (itemMenu->m_savehMenu) - Flag=GetMenuState((HMENU)itemMenu->m_savehMenu, Id, MF_BYCOMMAND) ; + wxCHECK_MSG( item, FALSE, "wxMenuItem::IsChecked(): no such item" ); -// Flag=GetMenuState((HMENU)m_hMenu, Id, MF_BYCOMMAND) ; + int flag = ::GetMenuState(GetHMENU(), Id, MF_BYCOMMAND); - if (Flag&MF_CHECKED) - return TRUE ; - else - return FALSE ; + return (flag & MF_CHECKED) != 0; } -bool wxMenuBar::Enabled(int Id) const +bool wxMenuBar::IsEnabled(int Id) const { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - if (!item) - return FALSE; + wxMenu *itemMenu = NULL; + wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - int Flag ; + wxCHECK_MSG( item, FALSE, "wxMenuItem::IsEnabled(): no such item" ); - if (itemMenu->m_hMenu) - Flag=GetMenuState((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND) ; - else if (itemMenu->m_savehMenu) - Flag=GetMenuState((HMENU)itemMenu->m_savehMenu, Id, MF_BYCOMMAND) ; + int flag = ::GetMenuState(GetHMENU(), Id, MF_BYCOMMAND) ; - if (Flag&MF_ENABLED) - return TRUE ; - else - return FALSE ; + return (flag & MF_ENABLED) != 0; } - void wxMenuBar::SetLabel(int Id, const wxString& label) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; + wxMenu *itemMenu = NULL; + wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - if (!item) - return; + if (!item) + return; - if (itemMenu->m_hMenu) - { - UINT was_flag = GetMenuState((HMENU)itemMenu->m_hMenu,Id,MF_BYCOMMAND) ; - ModifyMenu((HMENU)itemMenu->m_hMenu,Id,MF_BYCOMMAND|MF_STRING|was_flag,Id,(const char *)label) ; - } - else if (itemMenu->m_savehMenu) - { - UINT was_flag = GetMenuState((HMENU)itemMenu->m_savehMenu,Id,MF_BYCOMMAND) ; - ModifyMenu((HMENU)itemMenu->m_savehMenu,Id,MF_BYCOMMAND|MF_STRING|was_flag,Id,(const char *)label) ; - } + HMENU hMenu = GetHMENU(); + UINT was_flag = ::GetMenuState(hMenu, Id, MF_BYCOMMAND); + ::ModifyMenu(hMenu, Id, MF_BYCOMMAND | MF_STRING | was_flag, Id, label); } wxString wxMenuBar::GetLabel(int Id) const { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(Id, &itemMenu) ; + wxMenu *itemMenu = NULL; + wxMenuItem *item = FindItemForId(Id, &itemMenu) ; - if (!item) - return wxString(""); + wxCHECK_MSG( item, "", "wxMenuItem::GetLabel(): no such item" ); - static char tmp[128] ; - int len = 0; - if (itemMenu->m_hMenu) - { - len = GetMenuString((HMENU)itemMenu->m_hMenu,Id,tmp,127,MF_BYCOMMAND) ; - } - else if (itemMenu->m_savehMenu) - { - len = GetMenuString((HMENU)itemMenu->m_savehMenu,Id,tmp,127,MF_BYCOMMAND) ; - } + char tmp[128]; + int len = GetMenuString(GetHMENU(), Id, tmp, WXSIZEOF(tmp), MF_BYCOMMAND); + tmp[len] = '\0' ; -// int len = GetMenuString((HMENU)m_hMenu,Id,tmp,127,MF_BYCOMMAND) ; - tmp[len] = '\0' ; - return wxString(tmp) ; + return wxString(tmp); } void wxMenuBar::SetLabelTop(int pos, const wxString& label) { - UINT was_flag = GetMenuState((HMENU)m_hMenu,pos,MF_BYPOSITION) ; - if (was_flag&MF_POPUP) - { - was_flag &= 0xff ; - HMENU popup = GetSubMenu((HMENU)m_hMenu,pos) ; - ModifyMenu((HMENU)m_hMenu,pos,MF_BYPOSITION|MF_STRING|was_flag,(UINT)popup,(const char *)label) ; - } - else - ModifyMenu((HMENU)m_hMenu,pos,MF_BYPOSITION|MF_STRING|was_flag,pos,(const char *)label) ; + UINT was_flag = GetMenuState((HMENU)m_hMenu,pos,MF_BYPOSITION) ; + if (was_flag&MF_POPUP) + { + was_flag &= 0xff ; + HMENU popup = GetSubMenu((HMENU)m_hMenu,pos) ; + ModifyMenu((HMENU)m_hMenu,pos,MF_BYPOSITION|MF_STRING|was_flag,(UINT)popup,(const char *)label) ; + } + else + ModifyMenu((HMENU)m_hMenu,pos,MF_BYPOSITION|MF_STRING|was_flag,pos,(const char *)label) ; } wxString wxMenuBar::GetLabelTop(int pos) const { - static char tmp[128] ; - int len = GetMenuString((HMENU)m_hMenu,pos,tmp,127,MF_BYPOSITION) ; - tmp[len] = '\0' ; - return wxString(tmp); + static char tmp[128] ; + int len = GetMenuString((HMENU)m_hMenu,pos,tmp,127,MF_BYPOSITION) ; + tmp[len] = '\0' ; + return wxString(tmp); } bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos) { - if (!m_menuBarFrame) - return TRUE; + if (!m_menuBarFrame) + return TRUE; - if (RemoveMenu((HMENU)m_hMenu, (UINT)pos, MF_BYPOSITION)) { - m_menus[pos]->m_hMenu = m_menus[pos]->m_savehMenu; - m_menus[pos]->m_savehMenu = 0; + if (RemoveMenu((HMENU)m_hMenu, (UINT)pos, MF_BYPOSITION)) { + m_menus[pos]->m_hMenu = m_menus[pos]->m_savehMenu; + m_menus[pos]->m_savehMenu = 0; - if (m_menuBarFrame) { - DrawMenuBar((HWND) m_menuBarFrame->GetHWND()) ; - } + if (m_menuBarFrame) { + DrawMenuBar((HWND) m_menuBarFrame->GetHWND()) ; + } - return TRUE; - } + return TRUE; + } - return FALSE; + return FALSE; } bool wxMenuBar::OnAppend(wxMenu *a_menu, const char *title) { - if (!a_menu->m_hMenu) - return FALSE; + if (!a_menu->m_hMenu) + return FALSE; - if (!m_menuBarFrame) - return TRUE; + if (!m_menuBarFrame) + return TRUE; - a_menu->m_savehMenu = a_menu->m_hMenu; - a_menu->m_hMenu = 0; + a_menu->m_savehMenu = a_menu->m_hMenu; + a_menu->m_hMenu = 0; - AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING, (UINT)a_menu->m_savehMenu, title); + AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING, (UINT)a_menu->m_savehMenu, title); - DrawMenuBar((HWND) m_menuBarFrame->GetHWND()); + DrawMenuBar((HWND)m_menuBarFrame->GetHWND()); - return TRUE; + return TRUE; } void wxMenuBar::Append (wxMenu * menu, const wxString& title) { - if (!OnAppend(menu, title)) - return; + if (!OnAppend(menu, title)) + return; - m_menuCount ++; - wxMenu **new_menus = new wxMenu *[m_menuCount]; - wxString *new_titles = new wxString[m_menuCount]; - int i; + m_menuCount ++; + wxMenu **new_menus = new wxMenu *[m_menuCount]; + wxString *new_titles = new wxString[m_menuCount]; + int i; - for (i = 0; i < m_menuCount - 1; i++) - { - new_menus[i] = m_menus[i]; - m_menus[i] = NULL; - new_titles[i] = m_titles[i]; - m_titles[i] = ""; - } - if (m_menus) - { - delete[]m_menus; - delete[]m_titles; - } - m_menus = new_menus; - m_titles = new_titles; + for (i = 0; i < m_menuCount - 1; i++) + { + new_menus[i] = m_menus[i]; + m_menus[i] = NULL; + new_titles[i] = m_titles[i]; + m_titles[i] = ""; + } + if (m_menus) + { + delete[]m_menus; + delete[]m_titles; + } + m_menus = new_menus; + m_titles = new_titles; - m_menus[m_menuCount - 1] = (wxMenu *)menu; - m_titles[m_menuCount - 1] = title; + m_menus[m_menuCount - 1] = (wxMenu *)menu; + m_titles[m_menuCount - 1] = title; - ((wxMenu *)menu)->m_menuBar = (wxMenuBar *) this; - ((wxMenu *)menu)->SetParent(this); + ((wxMenu *)menu)->m_menuBar = (wxMenuBar *) this; + ((wxMenu *)menu)->SetParent(this); } void wxMenuBar::Delete(wxMenu * menu, int i) { - int j; - int ii = (int) i; - - if (menu != 0) { - for (ii = 0; ii < m_menuCount; ii++) { - if (m_menus[ii] == menu) - break; - } - if (ii >= m_menuCount) - return; - } else { - if (ii < 0 || ii >= m_menuCount) - return; - menu = m_menus[ii]; - } + int j; + int ii = (int) i; + + if (menu != 0) { + for (ii = 0; ii < m_menuCount; ii++) { + if (m_menus[ii] == menu) + break; + } + if (ii >= m_menuCount) + return; + } else { + if (ii < 0 || ii >= m_menuCount) + return; + menu = m_menus[ii]; + } - if (!OnDelete(menu, ii)) - return; + if (!OnDelete(menu, ii)) + return; - menu->SetParent(NULL); + menu->SetParent(NULL); - -- m_menuCount; - for (j = ii; j < m_menuCount; j++) { - m_menus[j] = m_menus[j + 1]; - m_titles[j] = m_titles[j + 1]; - } + -- m_menuCount; + for (j = ii; j < m_menuCount; j++) { + m_menus[j] = m_menus[j + 1]; + m_titles[j] = m_titles[j + 1]; + } } // Find the menu menuString, item itemString, and return the item id. // Returns -1 if none found. int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemString) const { - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)menuString, buf1); - int i; - for (i = 0; i < m_menuCount; i++) + char buf1[200]; + char buf2[200]; + wxStripMenuCodes ((char *)(const char *)menuString, buf1); + int i; + for (i = 0; i < m_menuCount; i++) { - wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2); - if (strcmp (buf1, buf2) == 0) - return m_menus[i]->FindItem (itemString); + wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2); + if (strcmp (buf1, buf2) == 0) + return m_menus[i]->FindItem (itemString); } - return -1; + return -1; } wxMenuItem *wxMenuBar::FindItemForId (int Id, wxMenu ** itemMenu) const { - if (itemMenu) - *itemMenu = NULL; + if (itemMenu) + *itemMenu = NULL; - wxMenuItem *item = NULL; - int i; - for (i = 0; i < m_menuCount; i++) - { - item = m_menus[i]->FindItemForId (Id, itemMenu); - if (item) - return item; - } - return NULL; + wxMenuItem *item = NULL; + int i; + for (i = 0; i < m_menuCount; i++) + { + item = m_menus[i]->FindItemForId (Id, itemMenu); + if (item) + return item; + } + return NULL; } void wxMenuBar::SetHelpString (int Id, const wxString& helpString) { - int i; - for (i = 0; i < m_menuCount; i++) + int i; + for (i = 0; i < m_menuCount; i++) { - if (m_menus[i]->FindItemForId (Id)) - { - m_menus[i]->SetHelpString (Id, helpString); - return; - } + if (m_menus[i]->FindItemForId (Id)) + { + m_menus[i]->SetHelpString (Id, helpString); + return; + } } } wxString wxMenuBar::GetHelpString (int Id) const { - int i; - for (i = 0; i < m_menuCount; i++) + wxString helpString; + + for (int i = 0; i < m_menuCount; i++) { - if (m_menus[i]->FindItemForId (Id)) - return wxString(m_menus[i]->GetHelpString (Id)); + wxMenuItem *item = m_menus[i]->FindItemForId(Id); + if ( item ) + { + helpString = item->GetHelp(); + + break; + } } - return wxString(""); + + return helpString; } +// ---------------------------------------------------------------------------- +// helper functions +// ---------------------------------------------------------------------------- + wxWindow *wxMenu::GetWindow() const -{ - if ( m_pInvokingWindow != NULL ) - return m_pInvokingWindow; - if ( m_menuBar != NULL) - return m_menuBar->m_menuBarFrame; - return NULL; +{ + if ( m_pInvokingWindow != NULL ) + return m_pInvokingWindow; + else if ( m_menuBar != NULL) + return m_menuBar->m_menuBarFrame; + + return NULL; } WXHMENU wxMenu::GetHMenu() const { - if ( m_hMenu != 0 ) - return m_hMenu; - else if ( m_savehMenu != 0 ) - return m_savehMenu; + if ( m_hMenu != 0 ) + return m_hMenu; + else if ( m_savehMenu != 0 ) + return m_savehMenu; + + wxFAIL_MSG("wxMenu without HMENU"); - return 0; + return 0; } -// Update 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. +// Update 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 wxMenu::UpdateUI(wxEvtHandler* source) { - if (!source && GetInvokingWindow()) - source = GetInvokingWindow()->GetEventHandler(); - if (!source) - source = GetEventHandler(); - if (!source) - source = this; - - wxNode* node = GetItems().First(); - while (node) - { - wxMenuItem* item = (wxMenuItem*) node->Data(); - if ( !item->IsSeparator() ) + if (!source && GetInvokingWindow()) + source = GetInvokingWindow()->GetEventHandler(); + if (!source) + source = GetEventHandler(); + if (!source) + source = this; + + wxNode* node = GetItems().First(); + while (node) { - wxWindowID id = item->GetId(); - wxUpdateUIEvent event(id); - event.SetEventObject( source ); - - if (source->ProcessEvent(event)) - { - if (event.GetSetText()) - SetLabel(id, event.GetText()); - if (event.GetSetChecked()) - Check(id, event.GetChecked()); - if (event.GetSetEnabled()) - Enable(id, event.GetEnabled()); - } - - if (item->GetSubMenu()) - item->GetSubMenu()->UpdateUI(source); - } - node = node->Next(); - } + wxMenuItem* item = (wxMenuItem*) node->Data(); + if ( !item->IsSeparator() ) + { + wxWindowID id = item->GetId(); + wxUpdateUIEvent event(id); + event.SetEventObject( source ); + + if (source->ProcessEvent(event)) + { + if (event.GetSetText()) + SetLabel(id, event.GetText()); + if (event.GetSetChecked()) + Check(id, event.GetChecked()); + if (event.GetSetEnabled()) + Enable(id, event.GetEnabled()); + } + + if (item->GetSubMenu()) + item->GetSubMenu()->UpdateUI(source); + } + node = node->Next(); + } } -- 2.45.2