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 881adb6ee550133996ddd51a2b1a69366935c7e7..98a799a12b3284fecbb9e881d1265e6c55aa1f55 100644 (file)
--- a/include/wx/fontmap.h
+++ b/include/wx/fontmap.h
@@ -25,13 +25,13 @@
 #endif // wxUSE_GUI
 
 #if wxUSE_CONFIG && wxUSE_FILECONFIG
 #endif // wxUSE_GUI
 
 #if wxUSE_CONFIG && wxUSE_FILECONFIG

-    class WXDLLIMPEXP_BASE wxConfigBase;
+    class WXDLLIMPEXP_FWD_BASE wxConfigBase;

 #endif // wxUSE_CONFIG
 
 #endif // wxUSE_CONFIG
 

-class WXDLLIMPEXP_CORE wxFontMapper;
+class WXDLLIMPEXP_FWD_CORE wxFontMapper;

 
 #if wxUSE_GUI
 
 #if wxUSE_GUI

-    class WXDLLIMPEXP_CORE wxWindow;
+    class WXDLLIMPEXP_FWD_CORE wxWindow;

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


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

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

 public:
 public:

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

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


@@ -70,6 +68,10 @@ public:
     // 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);
 

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

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


@@ -120,10 +122,14 @@ public:
     void SetConfigPath(const wxString& prefix);
 
     // return default config 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:
 #if wxUSE_CONFIG && wxUSE_FILECONFIG
     // get the config object we're using -- either the global config object
 protected:
 #if wxUSE_CONFIG && wxUSE_FILECONFIG
     // get the config object we're using -- either the global config object


@@ -159,15 +165,12 @@ 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;
 
     friend class wxFontMapperPathChanger;
 
     // the global fontmapper object or NULL
     static wxFontMapper *sm_instance;
 
     friend class wxFontMapperPathChanger;
 

-    DECLARE_NO_COPY_CLASS(wxFontMapperBase)
+    wxDECLARE_NO_COPY_CLASS(wxFontMapperBase);

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


@@ -239,6 +242,9 @@ public:
     // are additional methods in the subclass.
     static wxFontMapper *Get();
 
     // 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
     // encoding and saves the result in config if ok - this results in the
 protected:
     // GetAltForEncoding() helper: tests for the existence of the given
     // encoding and saves the result in config if ok - this results in the


@@ -258,10 +264,7 @@ protected:
     wxWindow *m_windowParent;
 
 private:
     wxWindow *m_windowParent;
 
 private:

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

 };
 
 #endif // wxUSE_GUI
 };
 
 #endif // wxUSE_GUI