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
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user