X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ed946f2835520aeae67c69582c068bf2e109008..3d777efedc1e05bd6c2a7c34a00a65895b62bb13:/include/wx/gtk/menu.h diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index b73dfc1c13..629024591a 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -2,7 +2,6 @@ // Name: wx/gtk/menu.h // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -21,7 +20,7 @@ public: wxMenuBar(); wxMenuBar(long style); wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); - virtual ~wxMenuBar(); + ~wxMenuBar(); // implement base class (pure) virtuals virtual bool Append( wxMenu *menu, const wxString &title ); @@ -34,31 +33,28 @@ public: virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const; virtual void EnableTop( size_t pos, bool flag ); + virtual bool IsEnabledTop(size_t pos) const; virtual void SetMenuLabel( size_t pos, const wxString& label ); virtual wxString GetMenuLabel( size_t pos ) const; void SetLayoutDirection(wxLayoutDirection dir); wxLayoutDirection GetLayoutDirection() const; - // wxMenuBar is not a top level window but it still doesn't need a parent - // window - virtual bool GTKNeedsParent() const { return false; } - - void Attach(wxFrame *frame); - - // implementation only from now on - void SetInvokingWindow( wxWindow *win ); - void UnsetInvokingWindow( wxWindow *win ); + virtual void Attach(wxFrame *frame); + virtual void Detach(); private: // common part of Append and Insert - bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1); - - GtkWidget *m_menubar; - wxWindow *m_invokingWindow; + void GtkAppend(wxMenu* menu, const wxString& title, int pos = -1); void Init(size_t n, wxMenu *menus[], const wxString titles[], long style); + // wxMenuBar is not a top level window but it still doesn't need a parent + // window + virtual bool GTKNeedsParent() const { return false; } + + GtkWidget* m_menubar; + DECLARE_DYNAMIC_CLASS(wxMenuBar) }; @@ -82,10 +78,10 @@ public: void SetLayoutDirection(const wxLayoutDirection dir); wxLayoutDirection GetLayoutDirection() const; - // TODO: virtual void SetTitle(const wxString& title); + // Returns the title, with mnemonics translated to wx format + wxString GetTitle() const; - // implementation - int FindMenuIdByMenuItem( GtkWidget *menuItem ) const; + // TODO: virtual void SetTitle(const wxString& title); // implementation GTK only GtkWidget *m_menu; // GtkMenu @@ -103,9 +99,8 @@ private: void Init(); // common part of Append (if pos == -1) and Insert - bool GtkAppend(wxMenuItem *item, int pos=-1); + void GtkAppend(wxMenuItem* item, int pos = -1); - GtkWidget *m_prevRadio; DECLARE_DYNAMIC_CLASS(wxMenu) };