X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b88201ff5f0f9ed18db555b70eb7123c8a7c9c6..a516284f67e1910fc6dc5364b289340332d0d35f:/include/wx/gtk/menu.h?ds=inline diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index cc00c2fd7c..506d1986c0 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -7,8 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKMENUH__ -#define __GTKMENUH__ +#ifndef _WX_GTKMENU_H_ +#define _WX_GTKMENU_H_ //----------------------------------------------------------------------------- // wxMenuBar @@ -21,7 +21,6 @@ public: wxMenuBar(); wxMenuBar(long style); wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); - virtual ~wxMenuBar(); // implement base class (pure) virtuals virtual bool Append( wxMenu *menu, const wxString &title ); @@ -34,26 +33,26 @@ public: virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const; virtual void EnableTop( size_t pos, bool flag ); - virtual void SetLabelTop( size_t pos, const wxString& label ); - virtual wxString GetLabelTop( 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; - void Attach(wxFrame *frame); + // wxMenuBar is not a top level window but it still doesn't need a parent + // window + virtual bool GTKNeedsParent() const { return false; } + + virtual void Attach(wxFrame *frame); + virtual void Detach(); // implementation only from now on - void SetInvokingWindow( wxWindow *win ); - void UnsetInvokingWindow( wxWindow *win ); + GtkWidget *m_menubar; // Public for hildon support +private: // common part of Append and Insert bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1); - GtkWidget *m_menubar; - long m_style; - wxWindow *m_invokingWindow; - -private: void Init(size_t n, wxMenu *menus[], const wxString titles[], long style); DECLARE_DYNAMIC_CLASS(wxMenuBar) @@ -79,15 +78,16 @@ 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 GtkWidget *m_owner; GtkAccelGroup *m_accel; + bool m_popupShown; protected: virtual wxMenuItem* DoAppend(wxMenuItem *item); @@ -107,4 +107,4 @@ private: }; #endif - // __GTKMENUH__ + // _WX_GTKMENU_H_