Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed __DARWIN__ conditional tests (the help menu doesn't work otherwise)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2002-01-19 08:33:40 +00:00
parent 54cb42a69b
commit 8caf72d33e
2 changed files with 246 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mac/carbon/menu.cpp
View File

@@ -450,7 +450,6 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
return true ; return true ;
} }
} }
#ifndef __DARWIN__
else if ( macMenuId == kHMHelpMenuID ) else if ( macMenuId == kHMHelpMenuID )
{ {
int menuItem = firstUserHelpMenuItem-1 ; int menuItem = firstUserHelpMenuItem-1 ;
@@ -499,7 +498,6 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
} }
} }
} }
#endif // __DARWIN__
for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++)
{ {
@@ -892,12 +890,7 @@ void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId,
{ {
for (int i = 0; i < m_menus.GetCount() ; i++) for (int i = 0; i < m_menus.GetCount() ; i++)
{ {
if ( m_menus[i]->MacGetMenuId() == macMenuId if ( m_menus[i]->MacGetMenuId() == macMenuId || ( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) ) )
#ifndef __DARWIN__
||
( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) )
#endif
)
{ {
if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) ) if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )
return ; return ;

9
src/mac/menu.cpp
View File

@@ -450,7 +450,6 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
return true ; return true ;
} }
} }
#ifndef __DARWIN__
else if ( macMenuId == kHMHelpMenuID ) else if ( macMenuId == kHMHelpMenuID )
{ {
int menuItem = firstUserHelpMenuItem-1 ; int menuItem = firstUserHelpMenuItem-1 ;
@@ -499,7 +498,6 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
} }
} }
} }
#endif // __DARWIN__
for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++)
{ {
@@ -892,12 +890,7 @@ void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId,
{ {
for (int i = 0; i < m_menus.GetCount() ; i++) for (int i = 0; i < m_menus.GetCount() ; i++)
{ {
if ( m_menus[i]->MacGetMenuId() == macMenuId if ( m_menus[i]->MacGetMenuId() == macMenuId || ( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) ) )
#ifndef __DARWIN__
||
( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) )
#endif
)
{ {
if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) ) if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )
return ; return ;