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

According to C99 standard (6.10.1 p3) defined() in #define is undefined, so we need replacement.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-23 09:39:42 +00:00
parent 477160b73f
commit da7a860276
1 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
samples/dialogs/dialogs.h
View File

@@ -12,42 +12,72 @@
#ifndef __DIALOGSH__ #ifndef __DIALOGSH__
#define __DIALOGSH__ #define __DIALOGSH__
#define USE_COLOURDLG_GENERIC \ #ifdef __WXUNIVERSAL__
( \ #define USE_WXUNIVERSAL 1
wxUSE_COLOURDLG && \ #else
( defined(__WXMSW__) || defined(__WXMAC__) ) && \ #define USE_WXUNIVERSAL 0
!defined(__WXUNIVERSAL__) \ #endif
#ifdef __WXMSW__
#define USE_WXMSW 1
#else
#define USE_WXMSW 0
#endif
#ifdef __WXMAC__
#define USE_WXMAC 1
#else
#define USE_WXMAC 0
#endif
#ifdef __WXGTK__
#define USE_WXGTK 1
#else
#define USE_WXGTK 0
#endif
#ifdef __WXPM__
#define USE_WXPM 1
#else
#define USE_WXPM 0
#endif
#define USE_COLOURDLG_GENERIC \
( \
wxUSE_COLOURDLG && \
( USE_WXMSW || USE_WXMAC ) && \
!USE_WXUNIVERSAL \
) )
#define USE_DIRDLG_GENERIC \ #define USE_DIRDLG_GENERIC \
( \ ( \
wxUSE_DIRDLG && \ wxUSE_DIRDLG && \
( defined(__WXMSW__) || defined(__WXMAC__) ) && \ ( USE_WXMSW || USE_WXMAC ) && \
!defined(__WXUNIVERSAL__) \ !USE_WXUNIVERSAL \
) )
#define USE_FILEDLG_GENERIC \ #define USE_FILEDLG_GENERIC \
( \ ( \
wxUSE_FILEDLG && \ wxUSE_FILEDLG && \
( defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__) ) && \ ( USE_WXMSW || USE_WXMAC || USE_WXPM ) && \
!defined(__WXUNIVERSAL__) \ !USE_WXUNIVERSAL \
) )
#define USE_FONTDLG_GENERIC \ #define USE_FONTDLG_GENERIC \
( \ ( \
wxUSE_FONTDLG && \ wxUSE_FONTDLG && \
( defined(__WXMSW__) || defined(__WXPM__) ) && \ ( USE_WXMSW || USE_WXPM ) && \
!defined(__WXUNIVERSAL__) \ !USE_WXUNIVERSAL \
) )
#define USE_MODAL_PRESENTATION \ #define USE_MODAL_PRESENTATION \
( \ ( \
defined(__WXMSW__) || \ USE_WXMSW || \
defined(__WXMAC__) || \ USE_WXMAC || \
defined(__WXGTK__) || \ USE_WXGTK || \
defined(__WXPM__) \ USE_WXPM \
) )
// Define a new application type // Define a new application type