X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70dc287a3997b65d954bfbd5861f72696bd3dd27..853b6cd0e4699dbec2c600d9d0390bdb53150a5f:/include/wx/gtk1/menu.h diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h index d2d836ed7e..aca498bcc2 100644 --- a/include/wx/gtk1/menu.h +++ b/include/wx/gtk1/menu.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/menu.h +// Name: wx/gtk1/menu.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,21 +10,17 @@ #ifndef __GTKMENUH__ #define __GTKMENUH__ -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "menu.h" -#endif - //----------------------------------------------------------------------------- // 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,23 +34,22 @@ 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; - - // implementation only from now on - void SetInvokingWindow( wxWindow *win ); - void UnsetInvokingWindow( wxWindow *win ); + virtual void SetMenuLabel( size_t pos, const wxString& label ); + virtual wxString GetMenuLabel( size_t pos ) const; // common part of Append and Insert - bool GtkAppend(wxMenu *menu, const wxString& title); + bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1); + + virtual void Attach(wxFrame *frame); + virtual void Detach(); GtkAccelGroup *m_accel; - GtkItemFactory *m_factory; 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) }; @@ -62,7 +57,7 @@ private: // wxMenu //----------------------------------------------------------------------------- -class wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors & dtor @@ -74,9 +69,12 @@ 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); + virtual wxMenuItem* DoAppend(wxMenuItem *item); + virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); + virtual wxMenuItem* DoRemove(wxMenuItem *item); + + // Returns the title, with mnemonics translated to wx format + wxString GetTitle() const; // TODO: virtual void SetTitle(const wxString& title); @@ -87,20 +85,18 @@ public: GtkWidget *m_menu; // GtkMenu GtkWidget *m_owner; GtkAccelGroup *m_accel; - GtkItemFactory *m_factory; private: // common code for all constructors: void Init(); - // common part of Append and Insert - bool GtkAppend(wxMenuItem *item); + // common part of Append (if pos == -1) and Insert + bool GtkAppend(wxMenuItem *item, int pos=-1); - // if the last menu item was a radio one, this field contains its path, - // otherwise it is empty - wxString m_pathLastRadio; + GtkWidget *m_prevRadio; DECLARE_DYNAMIC_CLASS(wxMenu) }; -#endif // __GTKMENUH__ +#endif + // __GTKMENUH__