merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions

View File

@@ -173,7 +173,7 @@ void wxMenuItem::Enable(bool enable)
(enable ? MF_ENABLED : MF_GRAYED));
if ( rc == -1 ) {
wxLogLastError("EnableMenuItem");
wxLogLastError(wxT("EnableMenuItem"));
}
wxMenuItemBase::Enable(enable);
@@ -192,7 +192,7 @@ void wxMenuItem::Check(bool check)
(check ? MF_CHECKED : MF_UNCHECKED));
if ( rc == -1 ) {
wxLogLastError("CheckMenuItem");
wxLogLastError(wxT("CheckMenuItem"));
}
wxMenuItemBase::Check(check);
@@ -218,7 +218,7 @@ void wxMenuItem::SetText(const wxString& text)
UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
if ( flagsOld == 0xFFFFFFFF )
{
wxLogLastError("GetMenuState");
wxLogLastError(wxT("GetMenuState"));
}
else
{