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

A few weeks of Unicode fixes (my old win95 laptop compiles sloowly,

Browse Source 
especially when through the nullmodem cable).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-06-14 14:39:11 +00:00
parent 5f8e1c164d
commit 837e57436a
67 changed files with 778 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/menuitem.cpp
View File

@@ -87,7 +87,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
#endif //owner drawn
m_strHelp(strHelp)
{
wxASSERT_MSG( pParentMenu != NULL, "a menu item should have a parent" );
wxASSERT_MSG( pParentMenu != NULL, _T("a menu item should have a parent") );
#if wxUSE_OWNER_DRAWN
// set default menu colors
@@ -151,7 +151,7 @@ void wxMenuItem::Enable(bool bDoEnable)
void wxMenuItem::Check(bool bDoCheck)
{
wxCHECK_RET( IsCheckable(), "only checkable items may be checked" );
wxCHECK_RET( IsCheckable(), _T("only checkable items may be checked") );
if ( m_bChecked != bDoCheck ) {
long rc = CheckMenuItem(GetHMenuOf(m_pParentMenu),
@@ -192,12 +192,12 @@ void wxMenuItem::SetName(const wxString& strName)
flagsOld |= MF_POPUP;
}
LPCSTR data;
LPCTSTR data;
#if wxUSE_OWNER_DRAWN
if ( IsOwnerDrawn() )
{
flagsOld |= MF_OWNERDRAW;
data = (LPCSTR)this;
data = (LPCTSTR)this;
}
else
#endif //owner drawn
@@ -210,7 +210,7 @@ void wxMenuItem::SetName(const wxString& strName)
MF_BYCOMMAND | flagsOld,
id, data) == 0xFFFFFFFF )
{
wxLogLastError("ModifyMenu");
wxLogLastError(_T("ModifyMenu"));
}
}
}