Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

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

diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h
index 1dbc2b334597304aaa6c6dc5fdfb91a01b379326..1f507c6303300c51cc07071b0ac85f81eed2fba3 100644 (file)
--- a/include/wx/univ/menu.h
+++ b/include/wx/univ/menu.h
@@ -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)