Fixes for WinCE build caused by my last commit.

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 58b9d754483103800c6d417302cc9ed018f71edd..d9e89d5e3ca26a5b6b8e1b25516709b06f1d7ac6 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -12,10 +12,6 @@
 #ifndef _WX_WXSTRCONVH__
 #define _WX_WXSTRCONVH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma interface "strconv.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/wxchar.h"
 #include "wx/buffer.h"
@@ -98,7 +94,7 @@ public:
 class WXDLLIMPEXP_BASE wxConvBrokenFileNames : public wxMBConv
 {
 public:
-    wxConvBrokenFileNames();
+    wxConvBrokenFileNames(const wxChar *charset);
     virtual ~wxConvBrokenFileNames() { delete m_conv; }
 
     virtual size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const;
@@ -166,7 +162,7 @@ public:
 };
 
 // ----------------------------------------------------------------------------
-// wxMBConvUCS4LE (for conversion using UTF32 Little Endian encoding)
+// wxMBConvUTF32LE (for conversion using UTF32 Little Endian encoding)
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxMBConvUTF32LE : public wxMBConv
@@ -177,7 +173,7 @@ public:
 };
 
 // ----------------------------------------------------------------------------
-// wxMBConvUCS4BE (for conversion using UTF32 Big Endian encoding)
+// wxMBConvUTF32BE (for conversion using UTF32 Big Endian encoding)
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxMBConvUTF32BE : public wxMBConv