added missing wxSTDs

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

diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h
index e5a5a3fa8ec761260b395bcce263cebd04f36853..1f507c6303300c51cc07071b0ac85f81eed2fba3 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__
 #define _WX_UNIV_MENU_H_
 
 #ifdef __GNUG__

-    #pragma interface "menu.h"
+    #pragma interface "univmenu.h"

 #endif
 
 #if wxUSE_ACCEL
 #endif
 
 #if wxUSE_ACCEL


@@ -142,8 +142,7 @@ private:
 #endif // wxUSE_ACCEL
 
     // it calls out OnDismiss()
 #endif // wxUSE_ACCEL
 
     // it calls out OnDismiss()

-    friend wxPopupMenuWindow;
-
+    friend class wxPopupMenuWindow;

     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 


@@ -275,7 +274,7 @@ private:
     bool m_shouldShowMenu;
 
     // it calls out ProcessMouseEvent()
     bool m_shouldShowMenu;
 
     // it calls out ProcessMouseEvent()

-    friend wxPopupMenuWindow;
+    friend class wxPopupMenuWindow;

 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMenuBar)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMenuBar)