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

Unicode fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-03-24 12:12:21 +00:00
parent d15a450d54
commit 846b6d921a
63 changed files with 438 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/object.cpp
View File

@@ -129,7 +129,7 @@ void wxObject::operator delete (void * buf)
// VC++ 6.0
#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum */)
void wxObject::operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
{
::operator delete(pData);
}
@@ -243,9 +243,7 @@ void wxClassInfo::InitializeClasses()
if (info->m_className)
{
wxASSERT_MSG( ++nClass < nMaxClasses,
_T("an infinite loop detected - have you used "
"IMPLEMENT_DYNAMIC_CLASS() twice (may be by "
"linking some object module(s) twice)?") );
_T("an infinite loop detected - have you used IMPLEMENT_DYNAMIC_CLASS() twice (may be by linking some object module(s) twice)?") );
sm_classTable->Put(info->m_className, (wxObject *)info);
}