X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..74af0b13434f4fa5c814a19a6d325d271944accf:/include/wx/gtk/menu.h diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index dcdba21d72..506d1986c0 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -7,12 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKMENUH__ -#define __GTKMENUH__ - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "menu.h" -#endif +#ifndef _WX_GTKMENU_H_ +#define _WX_GTKMENU_H_ //----------------------------------------------------------------------------- // wxMenuBar @@ -25,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 ); @@ -38,24 +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; + + // 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); -#ifndef __WXGTK20__ - GtkAccelGroup *m_accel; -#endif - 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) @@ -76,20 +73,26 @@ public: virtual ~wxMenu(); - // implement base class virtuals - virtual wxMenuItem* DoAppend(wxMenuItem *item); - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); - virtual wxMenuItem* DoRemove(wxMenuItem *item); + void Attach(wxMenuBarBase *menubar); - // TODO: virtual void SetTitle(const wxString& title); + void SetLayoutDirection(const wxLayoutDirection dir); + wxLayoutDirection GetLayoutDirection() const; - // implementation - int FindMenuIdByMenuItem( GtkWidget *menuItem ) const; + // Returns the title, with mnemonics translated to wx format + wxString GetTitle() 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); + virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); + virtual wxMenuItem* DoRemove(wxMenuItem *item); private: // common code for all constructors: @@ -98,9 +101,10 @@ private: // common part of Append (if pos == -1) and Insert bool GtkAppend(wxMenuItem *item, int pos=-1); - GtkWidget *m_prevRadio; + GtkWidget *m_prevRadio; DECLARE_DYNAMIC_CLASS(wxMenu) }; -#endif // __GTKMENUH__ +#endif + // _WX_GTKMENU_H_