X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0de9b5b23f70465393526546cd1a69fcfcd26e9c..f6577bba759fe395e7d45464af985fec37eff2a4:/include/wx/gtk1/menu.h diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h index 1e1d52349a..3638cee90e 100644 --- a/include/wx/gtk1/menu.h +++ b/include/wx/gtk1/menu.h @@ -92,13 +92,15 @@ public: // implementation only wxList& GetMenus() { return m_menus; } + + void SetInvokingWindow( wxWindow *win ); + void UnsetInvokingWindow( wxWindow *win ); GtkAccelGroup *m_accel; GtkItemFactory *m_factory; - -private: wxList m_menus; GtkWidget *m_menubar; + long m_style; }; //----------------------------------------------------------------------------- @@ -111,7 +113,9 @@ class wxMenu : public wxEvtHandler public: wxMenu( const wxString& title = wxEmptyString, - const wxFunction func = (wxFunction) NULL ); + const wxFunction func = (wxFunction) NULL, + long style = 0); + wxMenu( long style ); ~wxMenu(); // operations @@ -181,7 +185,13 @@ public: GtkAccelGroup *m_accel; GtkItemFactory *m_factory; -private: + // used by wxMenuBar + inline long GetStyle(void) const { return m_style; } + private: + // common code for both constructors: + void Init( const wxString& title, + const wxFunction func, + long style); wxString m_title; wxList m_items; @@ -189,6 +199,7 @@ private: wxFunction m_callback; wxEvtHandler *m_eventHandler; void *m_clientData; + long m_style; }; #endif // __GTKMENUH__