give an error if wxMotif is built in Unicode mode (to prevent bug reports like 117719...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index c8496d090eb27d0065ff9ecdbc60c1ddad150a49..624273135cdc802ce09ef0408d20eb0128605bc4 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1078,6 +1078,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/button.h
     wx/motif/checkbox.h
     wx/motif/checklst.h
     wx/motif/button.h
     wx/motif/checkbox.h
     wx/motif/checklst.h

+    wx/motif/chkconf.h

     wx/motif/choice.h
     wx/motif/clipbrd.h
     wx/motif/colour.h
     wx/motif/choice.h
     wx/motif/clipbrd.h
     wx/motif/colour.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 1de81cba3d524208f532b0facf4c573fd90d1616..f97ef58498f83ecdc392f088703f3bd597580edf 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1,13 +1,13 @@
-/**
-* Name:        wx/chkconf.h
-* Purpose:     check the config settings for consistency
-* Author:      Vadim Zeitlin
-* Modified by:
-* Created:     09.08.00
-* RCS-ID:      $Id$
-* Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwidgets.org>
-* Licence:     wxWindows licence
-*/
+/*
+ * Name:        wx/chkconf.h
+ * Purpose:     check the config settings for consistency
+ * Author:      Vadim Zeitlin
+ * Modified by:
+ * Created:     09.08.00
+ * RCS-ID:      $Id$
+ * Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwidgets.org>
+ * Licence:     wxWindows licence
+ */

 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 


@@ -23,6 +23,8 @@
 #  include "wx/msw/chkconf.h"
 #elif defined(__WXMAC__)
 #  include "wx/mac/chkconf.h"
 #  include "wx/msw/chkconf.h"
 #elif defined(__WXMAC__)
 #  include "wx/mac/chkconf.h"

+#elif defined(__WXMOTIF__)
+#  include "wx/mac/chkconf.h"

 #endif
 
 /*
 #endif
 
 /*


@@ -1217,24 +1219,6 @@
 
 #endif /* wxMSW */
 
 
 #endif /* wxMSW */
 

-/* wxMAC-specific dependencies */
-#ifdef __WXMAC__
-#   if wxUSE_UNICODE
-#       if !TARGET_CARBON
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxUSE_UNICODE is only supported for Carbon Targets."
-#           else
-#               define wxUSE_UNICODE 0
-#           endif
-#       endif
-#   endif
-#endif /* wxMAC */
-/* wxMotif-specific dependencies */
-#if defined(__WXMOTIF__) && wxUSE_NOTEBOOK && !wxUSE_TAB_DIALOG
-#  undef wxUSE_TAB_DIALOG
-#  define wxUSE_TAB_DIALOG 1
-#endif
-

 /* wxMGL-specific dependencies */
 #ifdef __WXMGL__
 #   if !wxUSE_PALETTE
 /* wxMGL-specific dependencies */
 #ifdef __WXMGL__
 #   if !wxUSE_PALETTE

diff --git a/include/wx/mac/chkconf.h b/include/wx/mac/chkconf.h
index 103406cf421b3ef5a7ad1cd165a0772f648f83a4..d6cf62611110e9260b4311ccfb8ca30ef31a390f 100644 (file)
--- a/include/wx/mac/chkconf.h
+++ b/include/wx/mac/chkconf.h
@@ -1,5 +1,28 @@
+/*
+ * Name:        wx/mac/chkconf.h
+ * Purpose:     Mac-specific config settings checks
+ * Author:      Vadim Zeitlin
+ * Modified by:
+ * Created:     2005-04-05 (extracted from wx/chkconf.h)
+ * RCS-ID:      $Id$
+ * Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
+ * Licence:     wxWindows licence
+ */
+
+/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
+
+#if wxUSE_UNICODE
+#    if !TARGET_CARBON
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_UNICODE is only supported for Carbon Targets."
+#        else
+#            define wxUSE_UNICODE 0
+#        endif
+#    endif
+#endif
+

 #ifdef __WXMAC_CLASSIC__
 #ifdef __WXMAC_CLASSIC__

-#include "wx/mac/classic/chkconf.h"
+#   include "wx/mac/classic/chkconf.h"

 #else
 #else

-#include "wx/mac/carbon/chkconf.h"
+#   include "wx/mac/carbon/chkconf.h"

 #endif
 #endif

diff --git a/include/wx/motif/chkconf.h b/include/wx/motif/chkconf.h
new file mode 100644 (file)
index 0000000..35534f9
--- /dev/null
+++ b/include/wx/motif/chkconf.h
@@ -0,0 +1,26 @@
+/*
+ * Name:        wx/motif/chkconf.h
+ * Purpose:     Motif-specific config settings checks
+ * Author:      Vadim Zeitlin
+ * Modified by:
+ * Created:     2005-04-05 (extracted from wx/chkconf.h)
+ * RCS-ID:      $Id$
+ * Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
+ * Licence:     wxWindows licence
+ */
+
+/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
+
+#if wxUSE_UNICODE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_UNICODE is not supported with wxMotif"
+#   else
+#       define wxUSE_UNICODE 0
+#   endif
+#endif
+
+#if wxUSE_NOTEBOOK && !wxUSE_TAB_DIALOG
+#   undef wxUSE_TAB_DIALOG
+#   define wxUSE_TAB_DIALOG 1
+#endif
+