From 050242339cc3e56f84fcc811d3e7f59fc2317747 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Tue, 1 Aug 2006 09:01:01 +0000
Subject: [PATCH] move wx11 and (the rest of) wxMGL specific checks into
 /chkconf.h file

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/bakefiles/files.bkl |  1 +
 include/wx/chkconf.h      | 16 ++--------------
 include/wx/mgl/chkconf.h  |  6 ++++++
 include/wx/x11/chkconf.h  | 23 +++++++++++++++++++++++
 4 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 include/wx/x11/chkconf.h

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index d6f481de93..b2c3756c6e 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1403,6 +1403,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/x11/app.h
     wx/x11/bitmap.h
     wx/x11/brush.h
+    wx/x11/chkconf.h
     wx/x11/clipbrd.h
     wx/x11/colour.h
     wx/x11/cursor.h
diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 696c3f798d..2f04543e91 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -29,6 +29,8 @@
 #  include "wx/mgl/chkconf.h"
 #elif defined(__WXMOTIF__)
 #  include "wx/motif/chkconf.h"
+#elif defined(__WXX11__)
+#  include "wx/x11/chkconf.h"
 #endif
 
 /*
@@ -1281,20 +1283,6 @@
 #   endif
 #endif /* wxGTK && !wxUniv */
 
-/* wxMGL-specific dependencies */
-#ifdef __WXMGL__
-#   if !wxUSE_PALETTE
-#       error "wxMGL requires wxUSE_PALETTE=1"
-#   endif
-#endif /* wxMGL */
-
-/* wxX11-specific dependencies */
-#ifdef __WXX11__
-#   if !wxUSE_PALETTE
-#       error "wxX11 requires wxUSE_PALETTE=1"
-#   endif
-#endif /* wxX11 */
-
 /* Hopefully we can emulate these dialogs in due course */
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
 #   ifdef wxUSE_COLOURDLG
diff --git a/include/wx/mgl/chkconf.h b/include/wx/mgl/chkconf.h
index 302d72a2ce..4f80358362 100644
--- a/include/wx/mgl/chkconf.h
+++ b/include/wx/mgl/chkconf.h
@@ -14,6 +14,12 @@
 #ifndef _WX_MGL_CHKCONF_H_
 #define _WX_MGL_CHKCONF_H_
 
+
+/* wxPalette is always needed */
+#if !wxUSE_PALETTE
+#   error "wxMGL requires wxUSE_PALETTE=1"
+#endif
+
 /*
    wxDisplay is not implemented for OS/2, use stub common version instead.
  */
diff --git a/include/wx/x11/chkconf.h b/include/wx/x11/chkconf.h
new file mode 100644
index 0000000000..b587067185
--- /dev/null
+++ b/include/wx/x11/chkconf.h
@@ -0,0 +1,23 @@
+/*
+ * Name:        wx/x11/chkconf.h
+ * Purpose:     Compiler-specific configuration checking
+ * Author:      Julian Smart
+ * Modified by:
+ * Created:     01/02/97
+ * RCS-ID:      $Id$
+ * Copyright:   (c) Julian Smart
+ * Licence:     wxWindows licence
+ */
+
+/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
+
+#ifndef _WX_X11_CHKCONF_H_
+#define _WX_X11_CHKCONF_H_
+
+
+/* wxPalette is always needed */
+#if !wxUSE_PALETTE
+#   error "wxX11 requires wxUSE_PALETTE=1"
+#endif
+
+#endif /* _WX_X11_CHKCONF_H_ */
-- 
2.45.2