wxEncodingConverter should and can be compiled

    without wxFontMapper and its corresponding wxUSE_FONTMAP

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

diff --git a/include/wx/encconv.h b/include/wx/encconv.h
index a4eecd05ec91dc7a41e30e0d4a9e10ae5a6192ac..7d925b35516a93c443987bbeba998feb47546414 100644 (file)
--- a/include/wx/encconv.h
+++ b/include/wx/encconv.h
@@ -16,8 +16,6 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_FONTMAP
-
 #include "wx/object.h"
 #include "wx/fontenc.h"
 #include "wx/dynarray.h"
@@ -162,6 +160,4 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
     DECLARE_NO_COPY_CLASS(wxEncodingConverter)
 };
 
-#endif // wxUSE_FONTMAP
-
 #endif  // _WX_ENCCONV_H_

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 8a16e004f4f643a4e3250cc5ddce489cbf9d0da3..ac467d90d873a7ef4933c2bac78d97578c208f12 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -18,8 +18,6 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_FONTMAP
-
 #include "wx/encconv.h"
 
 #include <stdlib.h>
@@ -530,4 +528,3 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
     return arr;
 }
 
-#endif // wxUSE_FONTMAP