X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/394285343bc3abf3368a92d33e440f5282e3bb33..eb2693818cc2985605644e81997ed6e9b5a4d478:/include/wx/msw/menu.h?ds=sidebyside diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h index e306076348..424d98971d 100644 --- a/include/wx/msw/menu.h +++ b/include/wx/msw/menu.h @@ -12,7 +12,7 @@ #ifndef _WX_MENU_H_ #define _WX_MENU_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "menu.h" #endif @@ -20,11 +20,17 @@ #include "wx/accel.h" #include "wx/dynarray.h" - WX_DEFINE_EXPORTED_ARRAY(wxAcceleratorEntry *, wxAcceleratorArray); + WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxAcceleratorEntry *, wxAcceleratorArray); #endif // wxUSE_ACCEL class WXDLLEXPORT wxFrame; +#if defined(__WXWINCE__) && wxUSE_TOOLBAR +class WXDLLEXPORT wxToolBar; +#endif + +#include "wx/arrstr.h" + // ---------------------------------------------------------------------------- // Menu // ---------------------------------------------------------------------------- @@ -110,7 +116,7 @@ private: wxAcceleratorArray m_accels; #endif // wxUSE_ACCEL - DECLARE_DYNAMIC_CLASS(wxMenu) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenu) }; // ---------------------------------------------------------------------------- @@ -153,6 +159,12 @@ public: virtual void Detach(); virtual void Attach(wxFrame *frame); +#if defined(__WXWINCE__) && wxUSE_TOOLBAR + // Under WinCE, a menubar is owned by the frame's toolbar + void SetToolBar(wxToolBar* toolBar) { m_toolBar = toolBar; } + wxToolBar* GetToolBar() const { return m_toolBar; } +#endif + #if wxUSE_ACCEL // get the accel table for all the menus const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; } @@ -189,8 +201,12 @@ protected: wxAcceleratorTable m_accelTable; #endif // wxUSE_ACCEL +#if defined(__WXWINCE__) && wxUSE_TOOLBAR + wxToolBar* m_toolBar; +#endif + private: - DECLARE_DYNAMIC_CLASS(wxMenuBar) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar) }; #endif // _WX_MENU_H_