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

Use __WINDOWS__ for OS kind checks and reserve __WXMSW__ for GUI toolkit.

Browse Source 
This change prepares the way for using wxGTK under Windows as this would
still define __WINDOWS__ but use __WXGTK__ instead of __WXMSW__.

Closes #14064.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-03-04 00:29:31 +00:00
parent 2e3407de5c
commit d98a58c543
55 changed files with 192 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/memory.cpp
View File

@@ -21,7 +21,7 @@
#include "wx/memory.h"
#ifndef WX_PRECOMP
#ifdef __WXMSW__
#ifdef __WINDOWS__
#include "wx/msw/wrapwin.h"
#endif
#include "wx/utils.h"
@@ -888,7 +888,7 @@ static MemoryCriticalSection memLocker;
#endif // USE_THREADSAFE_MEMORY_ALLOCATION
#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
#if !(defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
#if wxUSE_GLOBAL_MEMORY_OPERATORS
void * operator new (size_t size, wxChar * fileName, int lineNum)
{
@@ -922,7 +922,7 @@ void operator delete[] (void * buf)
}
#endif // wxUSE_ARRAY_MEMORY_OPERATORS
#endif // wxUSE_GLOBAL_MEMORY_OPERATORS
#endif // !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
#endif // !(defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
// TODO: store whether this is a vector or not.
void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
@@ -1045,7 +1045,7 @@ void wxTrace(const wxChar * ...)
va_start(ap, fmt);
#ifdef __WXMSW__
#ifdef __WINDOWS__
wvsprintf(buffer,fmt,ap) ;
#else
vsprintf(buffer,fmt,ap) ;
@@ -1059,7 +1059,7 @@ void wxTrace(const wxChar * ...)
wxDebugContext::GetStream().flush();
}
else
#ifdef __WXMSW__
#ifdef __WINDOWS__
#ifdef __WIN32__
OutputDebugString((LPCTSTR)buffer) ;
#else
@@ -1085,7 +1085,7 @@ void wxTraceLevel(int, const wxChar * ...)
va_start(ap, fmt);
#ifdef __WXMSW__
#ifdef __WINDOWS__
wxWvsprintf(buffer,fmt,ap) ;
#else
vsprintf(buffer,fmt,ap) ;
@@ -1099,7 +1099,7 @@ void wxTraceLevel(int, const wxChar * ...)
wxDebugContext::GetStream().flush();
}
else
#ifdef __WXMSW__
#ifdef __WINDOWS__
#ifdef __WIN32__
OutputDebugString((LPCTSTR)buffer) ;
#else