Added 'HasAlpha' attribute for wxColourProperty. Setting it to true allows user to...

[wxWidgets.git] / src / common / convauto.cpp

diff --git a/src/common/convauto.cpp b/src/common/convauto.cpp
index dde8af743e435a2c48a4f89bafd775b5017e5184..756e81c233f2d71b77dfe0e7ae96f1ad6712f19c 100644 (file)
--- a/src/common/convauto.cpp
+++ b/src/common/convauto.cpp
@@ -23,8 +23,6 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_WCHAR_T
-
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif //WX_PRECOMP
@@ -231,7 +229,7 @@ void wxConvAuto::SkipBOM(const char **src, size_t *len) const
 
 bool wxConvAuto::InitFromInput(const char *src, size_t len)
 {
-    m_bomType = DetectBOM(src, len);
+    m_bomType = DetectBOM(src, len == wxNO_LEN ? strlen(src) : len);
     if ( m_bomType == BOM_Unknown )
         return false;
 
@@ -318,5 +316,3 @@ wxConvAuto::FromWChar(char *dst, size_t dstLen,
 
     return m_conv->FromWChar(dst, dstLen, src, srcLen);
 }
-
-#endif // wxUSE_WCHAR_T