X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/294ea16de3359844cb884baad219b40ea04fac48..c4ec0ce8205de4659f1e52d16480b5c025ebc41e:/include/wx/gtk1/menu.h diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h index e28b4477e7..f2aef5abb5 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,15 +10,11 @@ #ifndef __GTKMENUH__ #define __GTKMENUH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "menu.h" -#endif - //----------------------------------------------------------------------------- // wxMenuBar //----------------------------------------------------------------------------- -class wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase { public: // ctors @@ -48,9 +44,7 @@ public: // 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; @@ -65,7 +59,7 @@ private: // wxMenu //----------------------------------------------------------------------------- -class wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors & dtor @@ -98,9 +92,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 + // __GTKMENUH__