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

Make some long #ifs shorter but multiline so diffs of other ports are more readable.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-23 15:01:33 +00:00
parent 7738c2e59a
commit d22004c4f4
5 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/bitmap.h
View File

@@ -32,7 +32,11 @@ class WXDLLEXPORT wxImage;
class WXDLLEXPORT wxMask; class WXDLLEXPORT wxMask;
class WXDLLEXPORT wxPalette; class WXDLLEXPORT wxPalette;
#if defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXCOCOA__) || defined(__WXMOTIF__) || defined(__WXX11__) #if defined(__WXMGL__) || \
defined(__WXMAC__) || \
defined(__WXCOCOA__) || \
defined(__WXMOTIF__) || \
defined(__WXX11__)
// Only used by some ports // Only used by some ports
// FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes // FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes

6
include/wx/encinfo.h
View File

@@ -37,7 +37,11 @@ struct WXDLLEXPORT wxNativeEncodingInfo
wxString facename; // may be empty meaning "any" wxString facename; // may be empty meaning "any"
wxFontEncoding encoding; // so that we know what this struct represents wxFontEncoding encoding; // so that we know what this struct represents
#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__) || defined(__WXCOCOA__) // FIXME: __WXCOCOA__ #if defined(__WXMSW__) || \
defined(__WXPM__) || \
defined(__WXMAC__) || \
defined(__WXCOCOA__) // FIXME: __WXCOCOA__
wxNativeEncodingInfo() wxNativeEncodingInfo()
: facename() : facename()
, encoding(wxFONTENCODING_SYSTEM) , encoding(wxFONTENCODING_SYSTEM)

9
include/wx/fontdlg.h
View File

@@ -65,8 +65,13 @@ protected:
// platform-specific wxFontDialog implementation // platform-specific wxFontDialog implementation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if defined(__WXUNIVERSAL__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXCOCOA__) \ #if defined(__WXUNIVERSAL__) || \
|| defined(__WXWINCE__) || defined(__WXGPE__) defined(__WXMOTIF__) || \
defined(__WXMAC__) || \
defined(__WXCOCOA__) || \
defined(__WXWINCE__) || \
defined(__WXGPE__)
#include "wx/generic/fontdlgg.h" #include "wx/generic/fontdlgg.h"
#define wxFontDialog wxGenericFontDialog #define wxFontDialog wxGenericFontDialog
#elif defined(__WXMSW__) #elif defined(__WXMSW__)

7
include/wx/gdicmn.h
View File

@@ -182,7 +182,12 @@ enum wxStockCursor
#if defined(__WXMSW__) || defined(__WXPM__) #if defined(__WXMSW__) || defined(__WXPM__)
#define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_RESOURCE) #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_RESOURCE)
#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXCOCOA__) #elif defined(__WXGTK__) || \
defined(__WXMOTIF__) || \
defined(__WXX11__) || \
defined(__WXMAC__) || \
defined(__WXMGL__) || \
defined(__WXCOCOA__)
// Initialize from an included XPM // Initialize from an included XPM
#define wxBITMAP(name) wxBitmap( (const char**) name##_xpm ) #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
#else // other platforms #else // other platforms

9
include/wx/wxprec.h
View File

@@ -14,7 +14,14 @@
// check if to use precompiled headers: do it for most Windows compilers unless // check if to use precompiled headers: do it for most Windows compilers unless
// explicitly disabled by defining NOPCH // explicitly disabled by defining NOPCH
#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__DIGITALMARS__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__) || defined(__MWERKS__) #if ( defined(__WXMSW__) && \
( defined(__BORLANDC__) || \
defined(__VISUALC__) || \
defined(__DIGITALMARS__) || \
defined(__WATCOMC__) ) ) || \
defined(__VISAGECPP__) || \
defined(__MWERKS__)
#if !defined(NOPCH) #if !defined(NOPCH)
#define WX_PRECOMP #define WX_PRECOMP
#endif #endif