projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Define WXBUILDING in Xcode projects.
[wxWidgets.git]
/
include
/
wx
/
chkconf.h
diff --git
a/include/wx/chkconf.h
b/include/wx/chkconf.h
index 12d8f96ec815445aa7206ac7089f55e87daf2718..ad5744acaf1f518f408a0ade9733ea7709c89ef0 100644
(file)
--- a/
include/wx/chkconf.h
+++ b/
include/wx/chkconf.h
@@
-92,6
+92,14
@@
# endif
#endif /* wxUSE_ANY */
# endif
#endif /* wxUSE_ANY */
+#ifndef wxUSE_COMPILER_TLS
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_COMPILER_TLS must be defined, please read comment near the top of this file."
+# else
+# define wxUSE_COMPILER_TLS 0
+# endif
+#endif /* !defined(wxUSE_COMPILER_TLS) */
+
#ifndef wxUSE_CONSOLE_EVENTLOOP
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_CONSOLE_EVENTLOOP must be defined, please read comment near the top of this file."
#ifndef wxUSE_CONSOLE_EVENTLOOP
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_CONSOLE_EVENTLOOP must be defined, please read comment near the top of this file."
@@
-1203,8
+1211,11
@@
#if defined(__WXWINCE__)
# include "wx/msw/wince/chkconf.h"
#if defined(__WXWINCE__)
# include "wx/msw/wince/chkconf.h"
-#elif defined(__W
XMSW
__)
+#elif defined(__W
INDOWS
__)
# include "wx/msw/chkconf.h"
# include "wx/msw/chkconf.h"
+# if defined(__WXGTK__)
+# include "wx/gtk/chkconf.h"
+# endif
#elif defined(__WXGTK__)
# include "wx/gtk/chkconf.h"
#elif defined(__WXCOCOA__)
#elif defined(__WXGTK__)
# include "wx/gtk/chkconf.h"
#elif defined(__WXCOCOA__)
@@
-1213,21
+1224,21
@@
# include "wx/osx/chkconf.h"
#elif defined(__OS2__)
# include "wx/os2/chkconf.h"
# include "wx/osx/chkconf.h"
#elif defined(__OS2__)
# include "wx/os2/chkconf.h"
-#elif defined(__WXMGL__)
-# include "wx/mgl/chkconf.h"
#elif defined(__WXDFB__)
# include "wx/dfb/chkconf.h"
#elif defined(__WXMOTIF__)
# include "wx/motif/chkconf.h"
#elif defined(__WXX11__)
# include "wx/x11/chkconf.h"
#elif defined(__WXDFB__)
# include "wx/dfb/chkconf.h"
#elif defined(__WXMOTIF__)
# include "wx/motif/chkconf.h"
#elif defined(__WXX11__)
# include "wx/x11/chkconf.h"
+#elif defined(__WXANDROID__)
+# include "wx/android/chkconf.h"
#endif
/*
__UNIX__ is also defined under Cygwin but we shouldn't perform these checks
#endif
/*
__UNIX__ is also defined under Cygwin but we shouldn't perform these checks
- there if we're building
wxMSW
.
+ there if we're building
Windows ports
.
*/
*/
-#if defined(__UNIX__) && !defined(__W
XMSW
__)
+#if defined(__UNIX__) && !defined(__W
INDOWS
__)
# include "wx/unix/chkconf.h"
#endif
# include "wx/unix/chkconf.h"
#endif
@@
-1451,7
+1462,7
@@
*/
#if wxUSE_GUI
*/
#if wxUSE_GUI
-#if wxUSE_ACCESSIBILITY && !defined(__WXMSW__)
&& !defined(__GCCXML__)
+#if wxUSE_ACCESSIBILITY && !defined(__WXMSW__)
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_ACCESSIBILITY is currently only supported under wxMSW"
# else
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_ACCESSIBILITY is currently only supported under wxMSW"
# else
@@
-1753,6
+1764,17
@@
# endif
#endif /* wxUSE_CHOICEDLG */
# endif
#endif /* wxUSE_CHOICEDLG */
+#if wxUSE_FILECTRL
+# if !wxUSE_DATETIME
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxFileCtrl requires wxDateTime"
+# else
+# undef wxUSE_DATETIME
+# define wxUSE_DATETIME 1
+# endif
+# endif
+#endif /* wxUSE_FILECTRL */
+
#if wxUSE_HELP
# if !wxUSE_BMPBUTTON
# ifdef wxABORT_ON_CONFIG_ERROR
#if wxUSE_HELP
# if !wxUSE_BMPBUTTON
# ifdef wxABORT_ON_CONFIG_ERROR