made the log dialog resizeable (again?)

[wxWidgets.git] / include / wx / univ / menu.h

diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h
index e5a5a3fa8ec761260b395bcce263cebd04f36853..1e75af07633c65345c5b499b3b5837735b32b26b 100644 (file)
--- 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
@@ -142,8 +142,11 @@ private:
 #endif // wxUSE_ACCEL
 
     // it calls out OnDismiss()
+#ifdef __WXMAC__
+    friend class wxPopupMenuWindow;
+#else
     friend wxPopupMenuWindow;
-
+#endif
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 
@@ -275,7 +278,7 @@ private:
     bool m_shouldShowMenu;
 
     // it calls out ProcessMouseEvent()
-    friend wxPopupMenuWindow;
+    friend class wxPopupMenuWindow;
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMenuBar)