fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

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

diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index 0256128ad46e32b3ec6d1a5daebb5b24104b6472..881adb6ee550133996ddd51a2b1a69366935c7e7 100644 (file)
--- a/include/wx/fontmap.h
+++ b/include/wx/fontmap.h
@@ -28,7 +28,7 @@
     class WXDLLIMPEXP_BASE wxConfigBase;
 #endif // wxUSE_CONFIG
 
     class WXDLLIMPEXP_BASE wxConfigBase;
 #endif // wxUSE_CONFIG
 

-class WXDLLIMPEXP_BASE wxFontMapper;
+class WXDLLIMPEXP_CORE wxFontMapper;

 
 #if wxUSE_GUI
     class WXDLLIMPEXP_CORE wxWindow;
 
 #if wxUSE_GUI
     class WXDLLIMPEXP_CORE wxWindow;


@@ -49,6 +49,8 @@ class WXDLLIMPEXP_BASE wxFontMapper;
 
 class WXDLLIMPEXP_BASE wxFontMapperBase
 {
 
 class WXDLLIMPEXP_BASE wxFontMapperBase
 {

+    // For IsWxFontMapper()
+    friend class WXDLLIMPEXP_CORE wxFontMapper;

 public:
     // constructtor and such
     // ---------------------
 public:
     // constructtor and such
     // ---------------------


@@ -60,7 +62,10 @@ 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 singleton to 'mapper' instance and return previous one
     static wxFontMapper *Set(wxFontMapper *mapper);
 
     // set the singleton to 'mapper' instance and return previous one
     static wxFontMapper *Set(wxFontMapper *mapper);


@@ -85,10 +90,13 @@ 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?)
     // return user-readable string describing the given encoding
     //
     // NB: hard-coded now, but might change later (read it from config?)


@@ -108,9 +116,6 @@ public:
     // ----------------------------------------------------------------------
 
 #if wxUSE_CONFIG && wxUSE_FILECONFIG
     // ----------------------------------------------------------------------
 
 #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 root config path to use (should be an absolute path)
     void SetConfigPath(const wxString& prefix);
 
     // set the root config path to use (should be an absolute path)
     void SetConfigPath(const wxString& prefix);
 


@@ -121,8 +126,8 @@ public:
 
 protected:
 #if wxUSE_CONFIG && wxUSE_FILECONFIG
 
 protected:
 #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
+    // 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


@@ -141,8 +146,7 @@ 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


@@ -155,6 +159,9 @@ protected:
     int NonInteractiveCharsetToEncoding(const wxString& charset);
 
 private:
     int NonInteractiveCharsetToEncoding(const wxString& charset);
 
 private:

+    // pseudo-RTTI since we aren't a wxObject.
+    virtual bool IsWxFontMapper();
+

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


@@ -228,6 +235,9 @@ 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();

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


@@ -248,16 +258,13 @@ protected:
     wxWindow *m_windowParent;
 
 private:
     wxWindow *m_windowParent;
 
 private:

-    DECLARE_NO_COPY_CLASS(wxFontMapper)
-};
-
-#else // !wxUSE_GUI
+    // pseudo-RTTI since we aren't a wxObject.
+    virtual bool IsWxFontMapper();

 
 

-class WXDLLIMPEXP_BASE wxFontMapper : public wxFontMapperBase
-{
+    DECLARE_NO_COPY_CLASS(wxFontMapper)

 };
 
 };
 

-#endif // wxUSE_GUI/!wxUSE_GUI
+#endif // wxUSE_GUI

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