Use correct reload flags on all platforms to avoid compilation errors

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

diff --git a/include/wx/convauto.h b/include/wx/convauto.h
index 3a2e2e480923eb55bcf50e6e9fdb4f8c40a33686..bc514cea3b0d8675c4221bf35569302723316ce0 100644 (file)
--- a/include/wx/convauto.h
+++ b/include/wx/convauto.h
@@ -14,8 +14,6 @@
 #include "wx/strconv.h"
 #include "wx/fontenc.h"
 
-#if wxUSE_WCHAR_T
-
 // ----------------------------------------------------------------------------
 // wxConvAuto: uses BOM to automatically detect input encoding
 // ----------------------------------------------------------------------------
@@ -107,11 +105,11 @@ private:
     void InitFromBOM(BOMType bomType);
 
     // create the correct conversion object for the BOM present in the
-    // beginning of the buffer; adjust the buffer to skip the BOM if found
+    // beginning of the buffer
     //
     // return false if the buffer is too short to allow us to determine if we
     // have BOM or not
-    bool InitFromInput(const char **src, size_t *len);
+    bool InitFromInput(const char *src, size_t len);
 
     // adjust src and len to skip over the BOM (identified by m_bomType) at the
     // start of the buffer
@@ -144,7 +142,5 @@ private:
     wxDECLARE_NO_ASSIGN_CLASS(wxConvAuto);
 };
 
-#endif // wxUSE_WCHAR_T
-
 #endif // _WX_CONVAUTO_H_