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

fix for spelling error (patch 621869) and use _() instead of _T() for the user visible strings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-10-13 12:07:59 +00:00
parent 06cdbdacb2
commit 69b0c112e7
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/generic/mdig.cpp
View File

@@ -108,11 +108,11 @@ bool wxGenericMDIParentFrame::Create(wxWindow *parent,
#if wxUSE_MENUS #if wxUSE_MENUS
m_pWindowMenu = new wxMenu; m_pWindowMenu = new wxMenu;
m_pWindowMenu->Append(wxWINDOWCLOSE, _T("Cl&ose")); m_pWindowMenu->Append(wxWINDOWCLOSE, _("Cl&ose"));
m_pWindowMenu->Append(wxWINDOWCLOSEALL, _T("Close Al&l")); m_pWindowMenu->Append(wxWINDOWCLOSEALL, _("Close Al&l"));
m_pWindowMenu->AppendSeparator(); m_pWindowMenu->AppendSeparator();
m_pWindowMenu->Append(wxWINDOWNEXT, _T("&Next")); m_pWindowMenu->Append(wxWINDOWNEXT, _("&Next"));
m_pWindowMenu->Append(wxWINDOWPREV, _T("&Previouse")); m_pWindowMenu->Append(wxWINDOWPREV, _("&Previous"));
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
} }
@@ -199,7 +199,7 @@ bool wxGenericMDIParentFrame::ProcessEvent(wxEvent& event)
#if 0 #if 0
/* This is sure to not give problems... */ /* This is sure to not give problems... */
&& (event.GetEventType() == wxEVT_COMMAND_MENU_SELECTED || && (event.GetEventType() == wxEVT_COMMAND_MENU_SELECTED ||
event.GetEventType() == wxEVT_UPDATE_UI )) event.GetEventType() == wxEVT_UPDATE_UI )
#else #else
/* This was tested on wxMSW and worked... */ /* This was tested on wxMSW and worked... */
&& event.GetEventObject() != m_pClientWindow && event.GetEventObject() != m_pClientWindow
@@ -208,8 +208,9 @@ bool wxGenericMDIParentFrame::ProcessEvent(wxEvent& event)
event.GetEventType() == wxEVT_KILL_FOCUS || event.GetEventType() == wxEVT_KILL_FOCUS ||
event.GetEventType() == wxEVT_CHILD_FOCUS || event.GetEventType() == wxEVT_CHILD_FOCUS ||
event.GetEventType() == wxEVT_COMMAND_SET_FOCUS || event.GetEventType() == wxEVT_COMMAND_SET_FOCUS ||
event.GetEventType() == wxEVT_COMMAND_KILL_FOCUS )) event.GetEventType() == wxEVT_COMMAND_KILL_FOCUS )
#endif #endif
)
{ {
res = m_pActiveChild->GetEventHandler()->ProcessEvent(event); res = m_pActiveChild->GetEventHandler()->ProcessEvent(event);
} }
@@ -290,7 +291,7 @@ void wxGenericMDIParentFrame::RemoveWindowMenu(wxMenuBar *pMenuBar)
if (pMenuBar && m_pWindowMenu) if (pMenuBar && m_pWindowMenu)
{ {
// Remove old window menu // Remove old window menu
int pos = pMenuBar->FindMenu(_T("&Window")); int pos = pMenuBar->FindMenu(_("&Window"));
if (pos != wxNOT_FOUND) if (pos != wxNOT_FOUND)
{ {
wxASSERT(m_pWindowMenu == pMenuBar->GetMenu(pos)); // DBG:: We're going to delete the wrong menu!!! wxASSERT(m_pWindowMenu == pMenuBar->GetMenu(pos)); // DBG:: We're going to delete the wrong menu!!!
@@ -303,14 +304,14 @@ void wxGenericMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar)
{ {
if (pMenuBar && m_pWindowMenu) if (pMenuBar && m_pWindowMenu)
{ {
int pos = pMenuBar->FindMenu(_T("Help")); int pos = pMenuBar->FindMenu(_("Help"));
if (pos == wxNOT_FOUND) if (pos == wxNOT_FOUND)
{ {
pMenuBar->Append(m_pWindowMenu, _T("&Window")); pMenuBar->Append(m_pWindowMenu, _("&Window"));
} }
else else
{ {
pMenuBar->Insert(pos, m_pWindowMenu, _T("&Window")); pMenuBar->Insert(pos, m_pWindowMenu, _("&Window"));
} }
} }
} }