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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index d6f481de93baa2ac6de5b8069d95da1ce97cda2d..b2c3756c6e04da7ff1e17bde748ee0d3ef99d931 100644 (file)
--- 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/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
     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 696c3f798d245c5287030c89e5d308c5bbafed6b..2f04543e91f10195e16c55c0b69c397876ec4141 100644 (file)
--- 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"
 #  include "wx/mgl/chkconf.h"
 #elif defined(__WXMOTIF__)
 #  include "wx/motif/chkconf.h"

+#elif defined(__WXX11__)
+#  include "wx/x11/chkconf.h"

 #endif
 
 /*
 #endif
 
 /*


@@ -1281,20 +1283,6 @@
 #   endif
 #endif /* wxGTK && !wxUniv */
 
 #   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
 /* 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 302d72a2cea21864451c8f0fb3537610b92da7f8..4f80358362911ef095bf0f8bc05f934f3ae4b9c3 100644 (file)
--- 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_
 
 #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.
  */
 /*
    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 (file)
index 0000000..b587067
--- /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_ */