added a test to check if wxHtmlWindow::SelectionToText() inserts \n characters correctly

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

diff --git a/include/wx/build.h b/include/wx/build.h
index 5141afcbc7821748425ce10a5825b18c8061897e..5a0fb9d871b52b5f7200f558a98fbd08314ba45e 100644 (file)
--- a/include/wx/build.h
+++ b/include/wx/build.h
@@ -48,8 +48,10 @@
     #define __WX_BO_DEBUG "no debug"
 #endif
 
     #define __WX_BO_DEBUG "no debug"
 #endif
 

-#if wxUSE_UNICODE
-    #define __WX_BO_UNICODE "Unicode"
+#if wxUSE_UNICODE_UTF8
+    #define __WX_BO_UNICODE "UTF-8"
+#elif wxUSE_UNICODE_WCHAR
+    #define __WX_BO_UNICODE "wchar_t"

 #else
     #define __WX_BO_UNICODE "ANSI"
 #endif
 #else
     #define __WX_BO_UNICODE "ANSI"
 #endif


@@ -65,7 +67,7 @@
     #define __WX_BO_COMPILER ",GCC " \
             __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__)
 #elif defined(__VISUALC__)
     #define __WX_BO_COMPILER ",GCC " \
             __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__)
 #elif defined(__VISUALC__)

-    #define __WX_BO_COMPILER ",Visual C++"
+    #define __WX_BO_COMPILER ",Visual C++ " __WX_BO_STRINGIZE(_MSC_VER)

 #elif defined(__BORLANDC__)
     #define __WX_BO_COMPILER ",Borland C++"
 #elif defined(__DIGITALMARS__)
 #elif defined(__BORLANDC__)
     #define __WX_BO_COMPILER ",Borland C++"
 #elif defined(__DIGITALMARS__)