always let the multiline text control process the Enter key presses

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

diff --git a/include/wx/encconv.h b/include/wx/encconv.h
index 13dc5353428af319a6ca90ebe81b5639f4cda935..84d26771755ce81d8f928ba6761539c068379e4b 100644 (file)
--- a/include/wx/encconv.h
+++ b/include/wx/encconv.h
@@ -15,6 +15,9 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_FONTMAP
+
 #include "wx/object.h"
 #include "wx/fontenc.h"
 #include "wx/dynarray.h"
@@ -44,7 +47,7 @@ enum
 // types
 // ----------------------------------------------------------------------------
 
-WX_DEFINE_ARRAY(wxFontEncoding, wxFontEncodingArray);
+WX_DEFINE_ARRAY_INT(wxFontEncoding, wxFontEncodingArray);
 
 //--------------------------------------------------------------------------------
 // wxEncodingConverter
@@ -147,5 +150,6 @@ class WXDLLEXPORT wxEncodingConverter : public wxObject
 
 };
 
+#endif // wxUSE_FONTMAP
 
 #endif  // _WX_ENCCONV_H_