rename wxRendererNative::DrawRadioButton() to DrawOptionButton() to avoid conflict...

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

diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index c8b5822ac72d9560b167c400677efc1a41312a1c..3a260ce5a2ca6e1a03c98915db245e64aecb8b57 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
 
 // ============================================================================


@@ -122,7 +122,7 @@ 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