From 149e70e1238c3bd7f425b2c58ca11513b0da59b4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 10 Feb 2008 17:08:44 +0000
Subject: [PATCH] add check for wxUSE_XLOCALE (and also wxUSE_INTL which wasn't
 checked for some reason)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/chkconf.h | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 56032a719b..1ea7d95e19 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -121,6 +121,14 @@
 #   endif
 #endif /* !defined(wxUSE_DYNAMIC_LOADER) */
 
+#ifndef wxUSE_INTL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_INTL must be defined."
+#   else
+#       define wxUSE_INTL 0
+#   endif
+#endif /* !defined(wxUSE_INTL) */
+
 #ifndef wxUSE_LOG
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_LOG must be defined."
@@ -299,6 +307,14 @@
 #   endif
 #endif /* wxUSE_WEAKREF */
 
+#ifndef wxUSE_XLOCALE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XLOCALE must be defined."
+#   else
+#       define wxUSE_XLOCALE 0
+#   endif
+#endif /* !defined(wxUSE_XLOCALE) */
+
 /*
    Section 1b: all these tests are for GUI only.
 
@@ -1028,7 +1044,11 @@
 #  include "wx/x11/chkconf.h"
 #endif
 
-#ifdef __UNIX__
+/*
+    __UNIX__ is also defined under Cygwin but we shouldn't perform these checks
+    there if we're building wxMSW.
+ */
+#if defined(__UNIX__) && !defined(__WXMSW__)
 #   include "wx/unix/chkconf.h"
 #endif
 
-- 
2.45.2