fix comparison of BYTE variable with -1 after last commit

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

diff --git a/include/wx/chartype.h b/include/wx/chartype.h
index ea5b9f93c62109e3c5dbfee6ca3cbf03ed3106d4..64f7147cbbc744d1c0a1be43059fe0518e32aaf0 100644 (file)
--- a/include/wx/chartype.h
+++ b/include/wx/chartype.h
@@ -154,8 +154,8 @@
     /* Sun's SunPro compiler supports the wchar_t type and wide character    */
     /* functions, but does not define __WCHAR_TYPE__. Define it here to      */
     /* allow unicode enabled builds.                                         */
     /* Sun's SunPro compiler supports the wchar_t type and wide character    */
     /* functions, but does not define __WCHAR_TYPE__. Define it here to      */
     /* allow unicode enabled builds.                                         */

-    #if defined(__SUNPRO_CC) || defined(__SUNPRO_C)
-    #define __WCHAR_TYPE__ wxchar_t
+    #if (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && !defined(__WCHAR_TYPE__)
+        #define __WCHAR_TYPE__ wxchar_t

     #endif
 
     /* GNU libc has __WCHAR_TYPE__ which requires special treatment, see */
     #endif
 
     /* GNU libc has __WCHAR_TYPE__ which requires special treatment, see */


@@ -190,7 +190,7 @@
 /* depending on the platform, Unicode build can either store wxStrings as
    wchar_t* or UTF-8 encoded char*: */
 #if wxUSE_UNICODE
 /* depending on the platform, Unicode build can either store wxStrings as
    wchar_t* or UTF-8 encoded char*: */
 #if wxUSE_UNICODE

-    // FIXME-UTF8: what would be better place for this?
+    /* FIXME-UTF8: what would be better place for this? */

     #if defined(wxUSE_UTF8_LOCALE_ONLY) && !defined(wxUSE_UNICODE_UTF8)
         #error "wxUSE_UTF8_LOCALE_ONLY only makes sense with wxUSE_UNICODE_UTF8"
     #endif
     #if defined(wxUSE_UTF8_LOCALE_ONLY) && !defined(wxUSE_UNICODE_UTF8)
         #error "wxUSE_UTF8_LOCALE_ONLY only makes sense with wxUSE_UNICODE_UTF8"
     #endif


@@ -210,14 +210,13 @@
 #else
     #define wxUSE_UNICODE_WCHAR 0
     #define wxUSE_UNICODE_UTF8  0
 #else
     #define wxUSE_UNICODE_WCHAR 0
     #define wxUSE_UNICODE_UTF8  0

+    #define wxUSE_UTF8_LOCALE_ONLY 0

 #endif
 
 /* define char type used by wxString internal representation: */
 #endif
 
 /* define char type used by wxString internal representation: */

-#if wxUSE_UNICODE_UTF8
-    typedef char wxStringCharType;
-#elif wxUSE_UNICODE_WCHAR
+#if wxUSE_UNICODE_WCHAR

     typedef wchar_t wxStringCharType;
     typedef wchar_t wxStringCharType;

-#else
+#else /* wxUSE_UNICODE_UTF8 || ANSI */

     typedef char wxStringCharType;
 #endif
 
     typedef char wxStringCharType;
 #endif
 


@@ -242,6 +241,18 @@
     #endif /* ASCII/Unicode */
 #endif /* !defined(_T) */
 
     #endif /* ASCII/Unicode */
 #endif /* !defined(_T) */
 

+/*
+   wxS ("wx string") macro can be used to create literals using the same
+   representation as wxString does internally, i.e. wchar_t in Unicode build
+   under Windows or char in UTF-8-based Unicode builds and (deprecated) ANSI
+   builds everywhere (see wxStringCharType definition above).
+ */
+#if wxUSE_UNICODE_WCHAR
+    #define wxS(x) wxCONCAT_HELPER(L, x)
+#else /* wxUSE_UNICODE_UTF8 || ANSI */
+    #define wxS(x) x
+#endif
+

 /* although global macros with such names are normally bad, we want to have  */
 /* another name for _T() which should be used to avoid confusion between     */
 /* _T() and _() in wxWidgets sources */
 /* although global macros with such names are normally bad, we want to have  */
 /* another name for _T() which should be used to avoid confusion between     */
 /* _T() and _() in wxWidgets sources */