X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52af3158e974b042008474268570f3bdb7ce95ee..033f86db5f422700eda6284ab338e84168bbba44:/include/wx/gtk/menu.h?ds=sidebyside diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index eda3f5a5b1..92bb3146d4 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,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,6 +34,7 @@ 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; @@ -44,20 +45,16 @@ public: // window virtual bool GTKNeedsParent() const { return false; } - void Attach(wxFrame *frame); + 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; + void GtkAppend(wxMenu* menu, const wxString& title, int pos = -1); -private: void Init(size_t n, wxMenu *menus[], const wxString titles[], long style); DECLARE_DYNAMIC_CLASS(wxMenuBar) @@ -83,15 +80,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); @@ -103,12 +101,11 @@ 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) }; #endif - // __GTKMENUH__ + // _WX_GTKMENU_H_