Reverted part of patch #876969 ("Fixes to Borland warnings"), resulted in bugs when...

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

diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index a997e952ef036ccd3866dc174642577e81ac9035..7e3481db5b3921f1c04167716522149372f446f5 100644 (file)
--- a/include/wx/fontmap.h
+++ b/include/wx/fontmap.h
@@ -12,10 +12,6 @@
 #ifndef _WX_FONTMAPPER_H_
 #define _WX_FONTMAPPER_H_
 
 #ifndef _WX_FONTMAPPER_H_
 #define _WX_FONTMAPPER_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "fontmap.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -28,14 +24,14 @@
     #include "wx/fontutil.h"    // for wxNativeEncodingInfo
 #endif // wxUSE_GUI
 
     #include "wx/fontutil.h"    // for wxNativeEncodingInfo
 #endif // wxUSE_GUI
 

-#if wxUSE_CONFIG
-    class WXDLLEXPORT wxConfigBase;
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+    class WXDLLIMPEXP_BASE wxConfigBase;

 #endif // wxUSE_CONFIG
 
 #endif // wxUSE_CONFIG
 

-class WXDLLEXPORT wxFontMapper;
+class WXDLLIMPEXP_BASE wxFontMapper;

 
 #if wxUSE_GUI
 
 #if wxUSE_GUI

-    class WXDLLEXPORT wxWindow;
+    class WXDLLIMPEXP_CORE wxWindow;

 #endif // wxUSE_GUI
 
 // ============================================================================
 #endif // wxUSE_GUI
 
 // ============================================================================


@@ -51,7 +47,7 @@ class WXDLLEXPORT wxFontMapper;
 //                   in knowledge of the encodings equivalence
 // ----------------------------------------------------------------------------
 
 //                   in knowledge of the encodings equivalence
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFontMapperBase
+class WXDLLIMPEXP_BASE wxFontMapperBase

 {
 public:
     // constructtor and such
 {
 public:
     // constructtor and such


@@ -66,10 +62,9 @@ public:
     // return instance of the wxFontMapper singleton
     static wxFontMapper *Get();
 
     // return instance of the wxFontMapper singleton
     static wxFontMapper *Get();
 

-    // set the sigleton to 'mapper' instance and return previous one
+    // set the singleton to 'mapper' instance and return previous one

     static wxFontMapper *Set(wxFontMapper *mapper);
 
     static wxFontMapper *Set(wxFontMapper *mapper);
 

-

     // translates charset strings to encoding
     // --------------------------------------
 
     // translates charset strings to encoding
     // --------------------------------------
 


@@ -81,7 +76,6 @@ public:
     virtual wxFontEncoding CharsetToEncoding(const wxString& charset,
                                              bool interactive = true);
 
     virtual wxFontEncoding CharsetToEncoding(const wxString& charset,
                                              bool interactive = true);
 

-

     // information about supported encodings
     // -------------------------------------
 
     // information about supported encodings
     // -------------------------------------
 


@@ -107,7 +101,7 @@ public:
     // GetDefaultConfigPath()
     // ----------------------------------------------------------------------
 
     // GetDefaultConfigPath()
     // ----------------------------------------------------------------------
 

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

     // set the config object to use (may be NULL to use default)
     void SetConfig(wxConfigBase *config) { m_config = config; }
 
     // set the config object to use (may be NULL to use default)
     void SetConfig(wxConfigBase *config) { m_config = config; }
 


@@ -120,7 +114,7 @@ public:
 
 
 protected:
 
 
 protected:

-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

     // get the config object we're using -- if it wasn't set explicitly, this
     // function will use wxConfig::Get() to get the global one
     wxConfigBase *GetConfig();
     // get the config object we're using -- if it wasn't set explicitly, this
     // function will use wxConfig::Get() to get the global one
     wxConfigBase *GetConfig();


@@ -147,6 +141,13 @@ protected:
     wxString m_configRootPath;
 #endif // wxUSE_CONFIG
 
     wxString m_configRootPath;
 #endif // wxUSE_CONFIG
 

+    // the real implementation of the base class version of CharsetToEncoding()
+    //
+    // returns wxFONTENCODING_UNKNOWN if encoding is unknown and we shouldn't
+    // ask the user about it, wxFONTENCODING_SYSTEM if it is unknown but we
+    // should/could ask the user
+    int NonInteractiveCharsetToEncoding(const wxString& charset);
+

 private:
     // the global fontmapper object or NULL
     static wxFontMapper *sm_instance;
 private:
     // the global fontmapper object or NULL
     static wxFontMapper *sm_instance;


@@ -171,7 +172,7 @@ private:
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-class WXDLLEXPORT wxFontMapper : public wxFontMapperBase
+class WXDLLIMPEXP_CORE wxFontMapper : public wxFontMapperBase

 {
 public:
     // default ctor
 {
 public:
     // default ctor


@@ -244,7 +245,7 @@ private:
 
 #else // !wxUSE_GUI
 
 
 #else // !wxUSE_GUI
 

-class WXDLLEXPORT wxFontMapper : public wxFontMapperBase
+class WXDLLIMPEXP_BASE wxFontMapper : public wxFontMapperBase

 {
 };
 
 {
 };