From 89ee194efdca9933cc2d5840b552611f770cd8a2 Mon Sep 17 00:00:00 2001 From: David Webster Date: Fri, 28 Apr 2000 12:59:22 +0000 Subject: [PATCH] static data members cannot be redeclared static in the cpp file under VisualAge, it already knows that it is static git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/os2/menu.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp index ccb2c50368..656fc38c29 100644 --- a/src/os2/menu.cpp +++ b/src/os2/menu.cpp @@ -52,7 +52,12 @@ static const int idMenuTitle = -2; // // The unique ID for Menus // -static USHORT wxMenu::m_nextMenuId = 0; +#ifdef __VISAGECPP__ +USHORT wxMenu::m_nextMenuId = 0; +#else +static USHORT wxMenu::m_nextMenuId = 0; +#endif + // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- @@ -278,7 +283,7 @@ bool wxMenu::DoInsertOrAppend( pSubmenu->SetParent(this); rItem.afStyle |= MIS_SUBMENU | MIS_TEXT; } - + // // If "Break" has just been called, insert a menu break before this item // (and don't forget to reset the flag)