makefiles update

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

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index d858e43dd0c44ef957e534c226aff33f352eaaa9..ccf61230d9e5cc70882da9f74947840c922f4a58 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "fontmap.h"
 #endif
 
@@ -36,13 +36,17 @@
     #include "wx/intl.h"
 #endif // PCH
 
-#include "wx/fontmap.h"
-#include "wx/fmappriv.h"
-
 #if wxUSE_CONFIG
     #include "wx/config.h"
 #endif // wxUSE_CONFIG
 
+#if defined(__WXMSW__)
+  #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
+  #include  "wx/msw/winundef.h"
+#endif
+
+#include "wx/fontmap.h"
+#include "wx/fmappriv.h"
 #include "wx/fontutil.h"
 #include "wx/msgdlg.h"
 #include "wx/fontdlg.h"
@@ -50,6 +54,61 @@
 
 #include "wx/encconv.h"
 
+#if wxUSE_EXTENDED_RTTI
+
+wxBEGIN_ENUM( wxFontEncoding )
+       wxENUM_MEMBER( wxFONTENCODING_SYSTEM )
+       wxENUM_MEMBER( wxFONTENCODING_DEFAULT )
+
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_1 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_2 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_3 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_4 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_5 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_6 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_7 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_8 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_9 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_10 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_11 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_12 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_13 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_14 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_15 )
+       wxENUM_MEMBER( wxFONTENCODING_ISO8859_MAX )
+       wxENUM_MEMBER( wxFONTENCODING_KOI8 )
+       wxENUM_MEMBER( wxFONTENCODING_ALTERNATIVE )
+       wxENUM_MEMBER( wxFONTENCODING_BULGARIAN )
+       wxENUM_MEMBER( wxFONTENCODING_CP437 )
+       wxENUM_MEMBER( wxFONTENCODING_CP850 )
+       wxENUM_MEMBER( wxFONTENCODING_CP852 )
+       wxENUM_MEMBER( wxFONTENCODING_CP855 )
+       wxENUM_MEMBER( wxFONTENCODING_CP866 )
+
+       wxENUM_MEMBER( wxFONTENCODING_CP874 )
+       wxENUM_MEMBER( wxFONTENCODING_CP932 )
+       wxENUM_MEMBER( wxFONTENCODING_CP936 )
+       wxENUM_MEMBER( wxFONTENCODING_CP949 )
+       wxENUM_MEMBER( wxFONTENCODING_CP950 )
+       wxENUM_MEMBER( wxFONTENCODING_CP1250 )
+       wxENUM_MEMBER( wxFONTENCODING_CP1251 )
+       wxENUM_MEMBER( wxFONTENCODING_CP1252 )
+       wxENUM_MEMBER( wxFONTENCODING_CP1253 )
+       wxENUM_MEMBER( wxFONTENCODING_CP1254 )
+       wxENUM_MEMBER( wxFONTENCODING_CP1255 )
+       wxENUM_MEMBER( wxFONTENCODING_CP1256 )
+       wxENUM_MEMBER( wxFONTENCODING_CP1257 )
+       wxENUM_MEMBER( wxFONTENCODING_CP12_MAX )
+       wxENUM_MEMBER( wxFONTENCODING_UTF7 )
+       wxENUM_MEMBER( wxFONTENCODING_UTF8 )
+       wxENUM_MEMBER( wxFONTENCODING_GB2312 )
+       wxENUM_MEMBER( wxFONTENCODING_BIG5 )
+       wxENUM_MEMBER( wxFONTENCODING_SHIFT_JIS )
+       wxENUM_MEMBER( wxFONTENCODING_EUC_JP )
+       wxENUM_MEMBER( wxFONTENCODING_UNICODE )
+wxEND_ENUM( wxFontEncoding )
+#endif
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -81,6 +140,8 @@ public:
 private:
     bool m_flagOld;
     bool& m_flag;
+
+    DECLARE_NO_COPY_CLASS(ReentrancyBlocker)
 };
 
 // ============================================================================
@@ -104,11 +165,16 @@ wxFontEncoding
 wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
 {
     // try the ways not needing the users intervention first
-    wxFontEncoding
-        encoding = wxFontMapperBase::CharsetToEncoding(charset, interactive);
+    int encoding = wxFontMapperBase::NonInteractiveCharsetToEncoding(charset);
 
     // if we failed to find the encoding, ask the user -- unless disabled
-    if ( (encoding == wxFONTENCODING_SYSTEM) && interactive )
+    if ( encoding == wxFONTENCODING_UNKNOWN )
+    {
+        // this is the special value which disables asking the user (he had
+        // chosen to suppress this the last time)
+        encoding = wxFONTENCODING_SYSTEM;
+    }
+    else if ( (encoding == wxFONTENCODING_SYSTEM) && interactive )
     {
         // prepare the dialog data
 
@@ -149,7 +215,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
             encoding = GetEncoding(n);
         }
 
-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
         // save the result in the config now
         wxFontMapperPathChanger path(this, FONTMAPPER_CHARSET_PATH);
         if ( path.IsOk() )
@@ -167,7 +233,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
 #endif // wxUSE_CONFIG
     }
 
-    return encoding;
+    return (wxFontEncoding)encoding;
 }
 
 // ----------------------------------------------------------------------------
@@ -183,7 +249,7 @@ bool wxFontMapper::TestAltEncoding(const wxString& configEntry,
     if ( wxGetNativeFontEncoding(encReplacement, info) &&
          wxTestFontEncoding(*info) )
     {
-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
         // remember the mapping in the config
         wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH);
 
@@ -249,7 +315,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
     }
     configEntry += encName;
 
-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
     // do we have a font spec for this encoding?
     wxString fontinfo;
     wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH);
@@ -361,7 +427,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
                 *info = retData.EncodingInfo();
                 info->encoding = retData.GetEncoding();
 
-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
                 // remember this in the config
                 wxFontMapperPathChanger path(this,
                                              FONTMAPPER_FONT_FROM_ENCODING_PATH);
@@ -381,7 +447,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
             // or selected to use equivalent encoding
             //
             // remember it to avoid asking the same question again later
-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
             wxFontMapperPathChanger path(this,
                                          FONTMAPPER_FONT_FROM_ENCODING_PATH);
             if ( path.IsOk() )