AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simpler for readable diffs in future new ports.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2005-04-15 16:47:28 +00:00
parent 8079756869
commit 7220e45533
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/bmpbase.cpp
View File

@ -19,8 +19,11 @@
#pragma hdrstop
#endif
#if defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXGTK__) \
|| defined(__WXMOTIF__) || defined(__WXX11__)
#if defined(__WXMGL__) || \
defined(__WXMAC__) || \
defined(__WXGTK__) || \
defined(__WXMOTIF__) || \
defined(__WXX11__)
#include "wx/setup.h"
#include "wx/utils.h"
@ -122,5 +125,4 @@ public:
IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
#endif // defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXCOCOA__) || defined(__WXMOTIF__) || defined(__WXX11__)
#endif // __WXMGL__ || __WXMAC__ || __WXCOCOA__ || __WXMOTIF__ || __WXX11__

6
src/common/string.cpp
View File

@ -1844,7 +1844,11 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
if ( (len >= 0 && len <= size)
// No EOVERFLOW on Windows nor Palm 6.0 nor OpenVMS nor MacOS (not X)
// not OS/2 (not Innotek libc).
#if !defined(__WXMSW__) && !defined(__WXPALMOS__) && !defined( __VMS ) && !(defined(__WXMAC__) && !defined(__WXMAC_OSX__)) && !(defined(__EMX__) && !defined(__INNOTEK_LIBC__))
#if !defined(__WXMSW__) && \
!defined(__WXPALMOS__) && \
!defined( __VMS ) && \
!(defined(__WXMAC__) && !defined(__WXMAC_OSX__)) && \
!(defined(__EMX__) && !defined(__INNOTEK_LIBC__))
|| errno != EOVERFLOW
#endif
)