X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e766c8a9ad51ecf73e8f1641992f1007ee9e5e0a..b31989e20882186006e2b2c4b8062ba8394b539d:/include/wx/univ/menu.h diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h index c8f14231eb..3daa74e772 100644 --- a/include/wx/univ/menu.h +++ b/include/wx/univ/menu.h @@ -26,24 +26,10 @@ class WXDLLEXPORT wxMenuInfo; WX_DECLARE_OBJARRAY(wxMenuInfo, wxMenuInfoArray); -class wxPopupMenuWindow; - +class WXDLLEXPORT wxMenuGeometryInfo; +class WXDLLEXPORT wxPopupMenuWindow; class WXDLLEXPORT wxRenderer; -// ---------------------------------------------------------------------------- -// wxMenu helper classes, used in implementation only -// ---------------------------------------------------------------------------- - -// used by wxRenderer -class WXDLLEXPORT wxMenuGeometryInfo -{ -public: - // get the total size of the menu - virtual wxSize GetSize() const = 0; - - virtual ~wxMenuGeometryInfo(); -}; - // ---------------------------------------------------------------------------- // wxMenu // ---------------------------------------------------------------------------- @@ -142,11 +128,7 @@ private: #endif // wxUSE_ACCEL // it calls out OnDismiss() -#ifdef __WXMAC__ friend class wxPopupMenuWindow; -#else - friend wxPopupMenuWindow; -#endif DECLARE_DYNAMIC_CLASS(wxMenu) }; @@ -278,11 +260,7 @@ private: bool m_shouldShowMenu; // it calls out ProcessMouseEvent() -#ifdef __WXMAC__ friend class wxPopupMenuWindow; -#else - friend wxPopupMenuWindow; -#endif DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxMenuBar)