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

Updated wxvc_dll.dsp and memory.h to make VC++ compile in DLL mode again

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-01-01 12:24:35 +00:00
parent 17e799185b
commit b40b0f5b20
10 changed files with 94 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/datetime.h
View File

@@ -376,7 +376,7 @@ public:
// a class representing a time zone: basicly, this is just an offset
// (in seconds) from GMT
class TimeZone
class WXDLLEXPORT TimeZone
{
public:
TimeZone(TZ tz);

13
include/wx/memory.h
View File

@@ -68,21 +68,22 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
// Added JACS 25/11/98: needed for some compilers
void * operator new (size_t size);
void * operator new (size_t size, wxChar * fileName, int lineNum);
WXDLLEXPORT void * operator new (size_t size, wxChar * fileName, int lineNum);
#if !defined(__VISAGECPP__)
void operator delete (void * buf);
#endif
#if wxUSE_ARRAY_MEMORY_OPERATORS
void * operator new[] (size_t size);
void * operator new[] (size_t size, wxChar * fileName, int lineNum);
void operator delete[] (void * buf);
WXDLLEXPORT void* operator new[] (size_t size);
WXDLLEXPORT void* operator new[] (size_t size, wxChar * fileName, int lineNum);
WXDLLEXPORT void operator delete[] (void * buf);
#endif
// VC++ 6.0
#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
void operator delete(void *buf, wxChar*, int);
void operator delete[](void *buf, wxChar*, int);
WXDLLEXPORT void operator delete(void *buf, wxChar*, int);
WXDLLEXPORT void operator delete[](void *buf, wxChar*, int);
#endif
#endif