OS/2 fix to support removal of WXPM ifdefs in header.

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 5362f1234ce0a7e7b9f09624ec3b943d208e36ae..bd39f333b0605ab255331347c8b8d50d82e35027 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -409,9 +409,11 @@ WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);
 
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
 
 
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
 

+#if wxUSE_GUI
+

 // VZ: the new version of wxCharsetToCodepage() is more politically correct
 //     and should work on other Windows versions as well but the old version is
 // VZ: the new version of wxCharsetToCodepage() is more politically correct
 //     and should work on other Windows versions as well but the old version is

-//     still needed for !wxUSE_FONTMAP case
+//     still needed for !wxUSE_FONTMAP || !wxUSE_GUI case

 
 extern long wxEncodingToCodepage(wxFontEncoding encoding)
 {
 
 extern long wxEncodingToCodepage(wxFontEncoding encoding)
 {


@@ -434,7 +436,7 @@ extern long wxEncodingToCodepage(wxFontEncoding encoding)
     return csetInfo.ciACP;
 }
 
     return csetInfo.ciACP;
 }
 

-#if wxUSE_FONTMAP && wxUSE_GUI
+#if wxUSE_FONTMAP

 
 extern long wxCharsetToCodepage(const wxChar *name)
 {
 
 extern long wxCharsetToCodepage(const wxChar *name)
 {


@@ -450,7 +452,12 @@ extern long wxCharsetToCodepage(const wxChar *name)
     return wxEncodingToCodepage(enc);
 }
 
     return wxEncodingToCodepage(enc);
 }
 

-#else // old wxCharsetToCodepage() by OK
+#endif // wxUSE_FONTMAP
+
+#endif // wxUSE_GUI
+
+// include old wxCharsetToCodepage() by OK if needed
+#if !wxUSE_GUI || !wxUSE_FONTMAP

 
 #include "wx/msw/registry.h"
 
 
 #include "wx/msw/registry.h"
 


@@ -486,7 +493,7 @@ extern long wxCharsetToCodepage(const wxChar *name)
     return CP;
 }
 
     return CP;
 }
 

-#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
+#endif // !wxUSE_GUI || !wxUSE_FONTMAP

 
 #endif // Win32
 
 
 #endif // Win32