X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..9b49405777342458dc1666001865eef7309b6c30:/include/wx/gtk/menu.h?ds=sidebyside diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index a154a64e21..63692e98b0 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -7,24 +7,20 @@ // 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 //----------------------------------------------------------------------------- -class wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { public: // ctors wxMenuBar(); wxMenuBar(long style); - wxMenuBar(int n, wxMenu *menus[], const wxString titles[]); + wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); virtual ~wxMenuBar(); // implement base class (pure) virtuals @@ -38,24 +34,31 @@ 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; } + + void Attach(wxFrame *frame); // implementation only from now on void SetInvokingWindow( wxWindow *win ); void UnsetInvokingWindow( wxWindow *win ); +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) }; @@ -63,7 +66,7 @@ private: // wxMenu //----------------------------------------------------------------------------- -class wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors & dtor @@ -74,20 +77,23 @@ 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; + // 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: @@ -96,9 +102,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_