X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71908213057690d5452f72b2b9c8e62b53357170..b5b49e42939fd7ef098241733648b534f71b526c:/include/wx/univ/menu.h

diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h
index e5a5a3fa8e..3daa74e772 100644
--- a/include/wx/univ/menu.h
+++ b/include/wx/univ/menu.h
@@ -13,7 +13,7 @@
 #define _WX_UNIV_MENU_H_
 
 #ifdef __GNUG__
-    #pragma interface "menu.h"
+    #pragma interface "univmenu.h"
 #endif
 
 #if wxUSE_ACCEL
@@ -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,8 +128,7 @@ private:
 #endif // wxUSE_ACCEL
 
     // it calls out OnDismiss()
-    friend wxPopupMenuWindow;
-
+    friend class wxPopupMenuWindow;
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 
@@ -275,7 +260,7 @@ private:
     bool m_shouldShowMenu;
 
     // it calls out ProcessMouseEvent()
-    friend wxPopupMenuWindow;
+    friend class wxPopupMenuWindow;
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMenuBar)