X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0ab6adfedf92aa4457821422e77c19b80f10bee..3d777efedc1e05bd6c2a7c34a00a65895b62bb13:/include/wx/gtk/menu.h diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index c9d198017e..629024591a 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -2,30 +2,25 @@ // Name: wx/gtk/menu.h // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKMENUH__ -#define __GTKMENUH__ - -#ifdef __GNUG__ - #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[]); - virtual ~wxMenuBar(); + wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); + ~wxMenuBar(); // implement base class (pure) virtuals virtual bool Append( wxMenu *menu, const wxString &title ); @@ -38,20 +33,28 @@ 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 bool IsEnabledTop(size_t pos) const; + virtual void SetMenuLabel( size_t pos, const wxString& label ); + virtual wxString GetMenuLabel( size_t pos ) const; - // implementation only from now on - void SetInvokingWindow( wxWindow *win ); - void UnsetInvokingWindow( wxWindow *win ); + void SetLayoutDirection(wxLayoutDirection dir); + wxLayoutDirection GetLayoutDirection() const; - GtkAccelGroup *m_accel; - GtkItemFactory *m_factory; - GtkWidget *m_menubar; - long m_style; - wxWindow *m_invokingWindow; + virtual void Attach(wxFrame *frame); + virtual void Detach(); private: + // common part of Append and Insert + 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) }; @@ -59,7 +62,7 @@ private: // wxMenu //----------------------------------------------------------------------------- -class wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors & dtor @@ -70,33 +73,37 @@ public: virtual ~wxMenu(); - // implement base class virtuals - virtual bool DoAppend(wxMenuItem *item); - virtual bool 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; - wxMenu(const wxString& title, const wxFunction func) - : wxMenuBase(title) - { - Callback(func); - } + // 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; - GtkItemFactory *m_factory; + 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: void Init(); + // common part of Append (if pos == -1) and Insert + void GtkAppend(wxMenuItem* item, int pos = -1); + + DECLARE_DYNAMIC_CLASS(wxMenu) }; -#endif // __GTKMENUH__ +#endif + // _WX_GTKMENU_H_