compilation fix for wxUSE_WCHAR_T=0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/file.h b/include/wx/file.h
index 73778df34d51eea35832a77e2a954451e63c7374..c11ea4d64877f9bf9afcc68cc253ab4ab7d918fd 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -20,6 +20,7 @@
 #ifndef WX_PRECOMP
   #include  "wx/string.h"
   #include  "wx/filefn.h"
 #ifndef WX_PRECOMP
   #include  "wx/string.h"
   #include  "wx/filefn.h"

+  #include  "wx/strconv.h"

 #endif
 
 #if wxUSE_FILE
 #endif
 
 #if wxUSE_FILE

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 60aef2c1ddefc78dc745f573a6c7b0027a58f02a..7b4b2255f3ce93ef961f71ad73e270a0b7274497 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -170,7 +170,7 @@ public:
     const char* cWX2MB(const char *psz) const { return psz; }
 };
 
     const char* cWX2MB(const char *psz) const { return psz; }
 };
 

-WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile;
+WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile, wxConvLocal;

 WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 
 #define wxFNCONV(name) name
 WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 
 #define wxFNCONV(name) name