fixing warning and compile error against 10.4

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

diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index fd6f79d62cfe8ca78c5e74fc773ebcd59443f19b..98a799a12b3284fecbb9e881d1265e6c55aa1f55 100644 (file)
--- a/include/wx/fontmap.h
+++ b/include/wx/fontmap.h
@@ -24,18 +24,18 @@
     #include "wx/fontutil.h"    // for wxNativeEncodingInfo
 #endif // wxUSE_GUI
 
     #include "wx/fontutil.h"    // for wxNativeEncodingInfo
 #endif // wxUSE_GUI
 

-#if wxUSE_CONFIG
-    class WXDLLEXPORT_BASE wxConfigBase;
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+    class WXDLLIMPEXP_FWD_BASE wxConfigBase;

 #endif // wxUSE_CONFIG
 
 #endif // wxUSE_CONFIG
 

-class WXDLLEXPORT_BASE wxFontMapper;
+class WXDLLIMPEXP_FWD_CORE wxFontMapper;

 
 #if wxUSE_GUI
 
 #if wxUSE_GUI

-    class WXDLLEXPORT_CORE wxWindow;
+    class WXDLLIMPEXP_FWD_CORE wxWindow;

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

-// wxFontMapper manages user-definable correspondence between wxWindows font
+// wxFontMapper manages user-definable correspondence between wxWidgets font

 // encodings and the fonts present on the machine.
 //
 // This is a singleton class, font mapper objects can only be accessed using
 // encodings and the fonts present on the machine.
 //
 // This is a singleton class, font mapper objects can only be accessed using


@@ -47,10 +47,10 @@ class WXDLLEXPORT_BASE wxFontMapper;
 //                   in knowledge of the encodings equivalence
 // ----------------------------------------------------------------------------
 
 //                   in knowledge of the encodings equivalence
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT_BASE wxFontMapperBase
+class WXDLLIMPEXP_BASE wxFontMapperBase

 {
 public:
 {
 public:

-    // constructtor and such
+    // constructor and such

     // ---------------------
 
     // default ctor
     // ---------------------
 
     // default ctor


@@ -60,11 +60,17 @@ public:
     virtual ~wxFontMapperBase();
 
     // return instance of the wxFontMapper singleton
     virtual ~wxFontMapperBase();
 
     // return instance of the wxFontMapper singleton

-    static wxFontMapper *Get();
+    // wxBase code only cares that it's a wxFontMapperBase
+    // In wxBase, wxFontMapper is only forward declared
+    // so one cannot implicitly cast from it to wxFontMapperBase.
+    static wxFontMapperBase *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);
 

+    // delete the existing font mapper if any
+    static void Reset();
+

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


@@ -77,7 +83,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
     // -------------------------------------
 


@@ -87,15 +92,24 @@ public:
     // get the n-th supported encoding
     static wxFontEncoding GetEncoding(size_t n);
 
     // get the n-th supported encoding
     static wxFontEncoding GetEncoding(size_t n);
 

-    // return internal string identifier for the encoding (see also
-    // GetEncodingDescription())
+    // return canonical name of this encoding (this is a short string,
+    // GetEncodingDescription() returns a longer one)

     static wxString GetEncodingName(wxFontEncoding encoding);
 
     static wxString GetEncodingName(wxFontEncoding encoding);
 

+    // return a list of all names of this encoding (see GetEncodingName)
+    static const wxChar** GetAllEncodingNames(wxFontEncoding encoding);
+

     // return user-readable string describing the given encoding
     //
     // NB: hard-coded now, but might change later (read it from config?)
     static wxString GetEncodingDescription(wxFontEncoding encoding);
 
     // return user-readable string describing the given encoding
     //
     // NB: hard-coded now, but might change later (read it from config?)
     static wxString GetEncodingDescription(wxFontEncoding encoding);
 

+    // find the encoding corresponding to the given name, inverse of
+    // GetEncodingName() and less general than CharsetToEncoding()
+    //
+    // returns wxFONTENCODING_MAX if the name is not a supported encoding
+    static wxFontEncoding GetEncodingFromName(const wxString& name);
+

 
     // functions which allow to configure the config object used: by default,
     // the global one (from wxConfigBase::Get() will be used) and the default
 
     // functions which allow to configure the config object used: by default,
     // the global one (from wxConfigBase::Get() will be used) and the default


@@ -103,22 +117,23 @@ public:
     // GetDefaultConfigPath()
     // ----------------------------------------------------------------------
 
     // GetDefaultConfigPath()
     // ----------------------------------------------------------------------
 

-#if wxUSE_CONFIG
-    // set the config object to use (may be NULL to use default)
-    void SetConfig(wxConfigBase *config) { m_config = config; }
-
+#if wxUSE_CONFIG && wxUSE_FILECONFIG

     // set the root config path to use (should be an absolute path)
     void SetConfigPath(const wxString& prefix);
 
     // return default config path
     // set the root config path to use (should be an absolute path)
     void SetConfigPath(const wxString& prefix);
 
     // return default config path

-    static const wxChar *GetDefaultConfigPath();
+    static const wxString& GetDefaultConfigPath();

 #endif // wxUSE_CONFIG
 
 
 #endif // wxUSE_CONFIG
 
 

+    // returns true for the base class and false for a "real" font mapper object
+    // (implementation-only)
+    virtual bool IsDummy() { return true; }
+

 protected:
 protected:

-#if wxUSE_CONFIG
-    // get the config object we're using -- if it wasn't set explicitly, this
-    // function will use wxConfig::Get() to get the global one
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+    // get the config object we're using -- either the global config object
+    // or a wxMemoryConfig object created by this class otherwise

     wxConfigBase *GetConfig();
 
     // gets the root path for our settings -- if it wasn't set explicitly, use
     wxConfigBase *GetConfig();
 
     // gets the root path for our settings -- if it wasn't set explicitly, use


@@ -137,19 +152,25 @@ protected:
     void RestorePath(const wxString& pathOld);
 
     // config object and path (in it) to use
     void RestorePath(const wxString& pathOld);
 
     // config object and path (in it) to use

-    wxConfigBase *m_config;
-    bool m_configIsDummy;
+    wxConfigBase *m_configDummy;

 
     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;
 
     friend class wxFontMapperPathChanger;
 
 private:
     // the global fontmapper object or NULL
     static wxFontMapper *sm_instance;
 
     friend class wxFontMapperPathChanger;
 

-    DECLARE_NO_COPY_CLASS(wxFontMapperBase)
+    wxDECLARE_NO_COPY_CLASS(wxFontMapperBase);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -167,7 +188,7 @@ private:
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

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

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


@@ -201,7 +222,9 @@ public:
                            bool interactive = true);
 
     // checks whether given encoding is available in given face or not.
                            bool interactive = true);
 
     // checks whether given encoding is available in given face or not.

-    // If no facename is given, 
+    //
+    // if no facename is given (default), return true if it's available in any
+    // facename at alll.

     virtual bool IsEncodingAvailable(wxFontEncoding encoding,
                                      const wxString& facename = wxEmptyString);
 
     virtual bool IsEncodingAvailable(wxFontEncoding encoding,
                                      const wxString& facename = wxEmptyString);
 


@@ -215,6 +238,12 @@ public:
     // the title for the dialogs (note that default is quite reasonable)
     void SetDialogTitle(const wxString& title) { m_titleDialog = title; }
 
     // the title for the dialogs (note that default is quite reasonable)
     void SetDialogTitle(const wxString& title) { m_titleDialog = title; }
 

+    // GUI code needs to know it's a wxFontMapper because there
+    // are additional methods in the subclass.
+    static wxFontMapper *Get();
+
+    // pseudo-RTTI since we aren't a wxObject.
+    virtual bool IsDummy() { return false; }

 
 protected:
     // GetAltForEncoding() helper: tests for the existence of the given
 
 protected:
     // GetAltForEncoding() helper: tests for the existence of the given


@@ -235,22 +264,16 @@ protected:
     wxWindow *m_windowParent;
 
 private:
     wxWindow *m_windowParent;
 
 private:

-    DECLARE_NO_COPY_CLASS(wxFontMapper)
+    wxDECLARE_NO_COPY_CLASS(wxFontMapper);

 };
 
 };
 

-#else // !wxUSE_GUI
-
-class WXDLLEXPORT_BASE wxFontMapper : public wxFontMapperBase
-{
-};
-
-#endif // wxUSE_GUI/!wxUSE_GUI
+#endif // wxUSE_GUI

 
 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------
 

-// the default font mapper for wxWindows programs do NOT use! This is for
+// the default font mapper for wxWidgets programs do NOT use! This is for

 // backward compatibility, use wxFontMapper::Get() instead
 #define wxTheFontMapper (wxFontMapper::Get())
 
 // backward compatibility, use wxFontMapper::Get() instead
 #define wxTheFontMapper (wxFontMapper::Get())