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/trunk@2257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-21 21:46:02 +00:00
parent eefa26bed1
commit 4de6207afa
11 changed files with 104 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/object.h
View File

@@ -196,7 +196,7 @@ class WXDLLEXPORT wxObject
bool IsKindOf(wxClassInfo *info) const;
#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
void * operator new (size_t size, wxChar * fileName = NULL, int lineNum = 0);
void operator delete (void * buf);
// VC++ 6.0
@@ -206,12 +206,12 @@ class WXDLLEXPORT wxObject
// Causes problems for VC++
#if wxUSE_ARRAY_MEMORY_OPERATORS && !defined(__VISUALC__) && !defined( __MWERKS__)
void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);
void * operator new[] (size_t size, wxChar * fileName = NULL, int lineNum = 0);
void operator delete[] (void * buf);
#endif
#ifdef __MWERKS__
void * operator new[] (size_t size, char * fileName , int lineNum = 0);
void * operator new[] (size_t size, wxChar * fileName , int lineNum = 0);
void operator delete[] (void * buf);
#endif
@@ -261,7 +261,7 @@ private:
#ifdef __WXDEBUG__
#ifndef WXDEBUG_NEW
#define WXDEBUG_NEW new(__FILE__,__LINE__)
#define WXDEBUG_NEW new(__TFILE__,__LINE__)
#endif
#else
#define WXDEBUG_NEW new
@@ -272,7 +272,7 @@ private:
// use WXDEBUG_NEW explicitly if you wish to use the debugging version.
#if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS
#define new new(__FILE__,__LINE__)
#define new new(__TFILE__,__LINE__)
#endif
#endif