X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ecffbff714ff707ded9266bf27c3347946cbcd9..94e2ed3b8db0220160c0b939782cd46914ec073a:/include/wx/gtk1/menu.h diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h index c4398fa168..f36c816d2a 100644 --- a/include/wx/gtk1/menu.h +++ b/include/wx/gtk1/menu.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.h +// Name: wx/gtk/menu.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,186 +7,92 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKMENUH__ #define __GTKMENUH__ #ifdef __GNUG__ -#pragma interface + #pragma interface "menu.h" #endif -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/list.h" -#include "wx/window.h" -#include "wx/menuitem.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxMenuBar; -class wxMenuItem; -class wxMenu; - -//----------------------------------------------------------------------------- -// const -//----------------------------------------------------------------------------- - -#define ID_SEPARATOR (-1) - //----------------------------------------------------------------------------- // wxMenuBar //----------------------------------------------------------------------------- -class wxMenuBar : public wxWindow +class wxMenuBar : public wxMenuBarBase { - DECLARE_DYNAMIC_CLASS(wxMenuBar) - public: // ctors wxMenuBar(); wxMenuBar(long style); wxMenuBar(int n, wxMenu *menus[], const wxString titles[]); - ~wxMenuBar(); + virtual ~wxMenuBar(); - // menubar construction - void Append( wxMenu *menu, const wxString &title ); + // implement base class (pure) virtuals + virtual bool Append( wxMenu *menu, const wxString &title ); + virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title); + virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title); + virtual wxMenu *Remove(size_t pos); - // 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; + virtual wxMenuItem* FindItem( int id, wxMenu **menu = 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; - - void SetLabel( int id, const wxString &label ); - wxString GetLabel( int id ) const; - wxString GetLabel() const { return wxWindow::GetLabel(); } - - 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 only - wxList& GetMenus() { return m_menus; } + virtual void EnableTop( size_t pos, bool flag ); + virtual void SetLabelTop( size_t pos, const wxString& label ); + virtual wxString GetLabelTop( size_t pos ) const; + // implementation only from now on void SetInvokingWindow( wxWindow *win ); void UnsetInvokingWindow( wxWindow *win ); + // common part of Append and Insert + bool GtkAppend(wxMenu *menu, const wxString& title); + GtkAccelGroup *m_accel; GtkItemFactory *m_factory; - wxList m_menus; GtkWidget *m_menubar; long m_style; + wxWindow *m_invokingWindow; + +private: + DECLARE_DYNAMIC_CLASS(wxMenuBar) }; //----------------------------------------------------------------------------- // wxMenu //----------------------------------------------------------------------------- -class wxMenu : public wxEvtHandler +class wxMenu : public wxMenuBase { - DECLARE_DYNAMIC_CLASS(wxMenu) - public: -#ifdef WXWIN_COMPATIBILITY - wxMenu( const wxString& title, const wxFunction func) - { - Init(title, 0, func); - } -#endif - wxMenu( const wxString& title = wxEmptyString, long style = 0 ) - { - Init(title, style); - } - - ~wxMenu(); - - // 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; - - // 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; + // ctors & dtor + wxMenu(const wxString& title, long style = 0) + : wxMenuBase(title, style) { Init(); } - // helpstring - virtual void SetHelpString(int id, const wxString& helpString); - virtual wxString GetHelpString(int id) const ; + wxMenu(long style = 0) : wxMenuBase(style) { Init(); } - // accessors - wxList& GetItems() { return m_items; } + virtual ~wxMenu(); - void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } - wxEvtHandler *GetEventHandler() { return m_eventHandler; } + // implement base class virtuals + virtual bool DoAppend(wxMenuItem *item); + virtual bool DoInsert(size_t pos, wxMenuItem *item); + virtual wxMenuItem *DoRemove(wxMenuItem *item); - void SetClientData( void* clientData ) { m_clientData = clientData; } - void* GetClientData() const { return m_clientData; } + // TODO: virtual void SetTitle(const wxString& title); - // 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); } + // compatibility only +#if wxUSE_MENU_CALLBACK + wxMenu(const wxString& title, const wxFunction func) + : wxMenuBase(title) + { + Init(); - wxFunction m_callback; -#endif // WXWIN_COMPATIBILITY + Callback(func); + } +#endif // WXWIN_COMPATIBILITY_2 // implementation int FindMenuIdByMenuItem( GtkWidget *menuItem ) const; - void SetInvokingWindow( wxWindow *win ); - wxWindow *GetInvokingWindow(); // implementation GTK only GtkWidget *m_menu; // GtkMenu @@ -194,24 +100,14 @@ public: GtkAccelGroup *m_accel; GtkItemFactory *m_factory; - // used by wxMenuBar - long GetStyle(void) const { return m_style; } - private: - // common code for both constructors: - void Init( const wxString& title, - long style -#ifdef WXWIN_COMPATIBILITY - , const wxFunction func = (wxFunction) NULL -#endif - ); - - wxString m_title; - wxList m_items; - wxWindow *m_invokingWindow; - wxEvtHandler *m_eventHandler; - void *m_clientData; - long m_style; + // common code for all constructors: + void Init(); + + // common part of Append and Insert + bool GtkAppend(wxMenuItem *item); + + DECLARE_DYNAMIC_CLASS(wxMenu) }; #endif // __GTKMENUH__