change wxDataViewItem id to void*

[wxWidgets.git] / include / wx / chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index f05ad703d27ae81173d91de352e25fa8d06b83e6..c808d500f18ac5cd42114f2c2730bf689e0bc538 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -10,6 +10,8 @@
  */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
+#ifndef _WX_CHKCONF_H_
+#define _WX_CHKCONF_H_
 
 /*
    Platform-specific checking.
@@ -35,6 +37,10 @@
 #  include "wx/x11/chkconf.h"
 #endif
 
+#ifdef __UNIX__
+#   include "wx/unix/chkconf.h"
+#endif
+
 #ifdef __WXUNIVERSAL__
 #   include "wx/univ/chkconf.h"
 #endif
@@ -83,6 +89,14 @@
    please keep the options in alphabetical order!
  */
 
+#ifndef wxUSE_CONSOLE_EVENTLOOP
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_CONSOLE_EVENTLOOP must be defined."
+#   else
+#       define wxUSE_CONSOLE_EVENTLOOP 0
+#   endif
+#endif /* !defined(wxUSE_CONSOLE_EVENTLOOP) */
+
 #ifndef wxUSE_CRASHREPORT
     /* this one is special: as currently it is Windows-only, don't force it
        to be defined on other platforms */
@@ -1842,3 +1856,5 @@
 #endif /* wxUSE_VARIANT */
 
 #endif /* wxUSE_GUI */
+
+#endif /* _WX_CHKCONF_H_ */