Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxEncodingConverter should and can be compiled

Browse Source 
without wxFontMapper and its corresponding wxUSE_FONTMAP


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2005-01-06 11:53:53 +00:00
parent 5a969262e1
commit 4b412d2382
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/encconv.h
View File

@@ -16,8 +16,6 @@
#include "wx/defs.h" #include "wx/defs.h"
#if wxUSE_FONTMAP
#include "wx/object.h" #include "wx/object.h"
#include "wx/fontenc.h" #include "wx/fontenc.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"
@@ -162,6 +160,4 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
DECLARE_NO_COPY_CLASS(wxEncodingConverter) DECLARE_NO_COPY_CLASS(wxEncodingConverter)
}; };
#endif // wxUSE_FONTMAP
#endif // _WX_ENCCONV_H_ #endif // _WX_ENCCONV_H_

3
src/common/encconv.cpp
View File

@@ -18,8 +18,6 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_FONTMAP
#include "wx/encconv.h" #include "wx/encconv.h"
#include <stdlib.h> #include <stdlib.h>
@@ -530,4 +528,3 @@ wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
return arr; return arr;
} }
#endif // wxUSE_FONTMAP