don't define operator<<(ostream&, wxString) at all if it's already defined in the...

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

diff --git a/include/wx/fmappriv.h b/include/wx/fmappriv.h
index 724b78a454d37b80b617b3081a8a3d6300a5191c..63924093ce075a37dd3d5938f2a8e6d136f07714 100644 (file)
--- a/include/wx/fmappriv.h
+++ b/include/wx/fmappriv.h
@@ -6,7 +6,7 @@
 // Created:     21.06.2003 (extracted from common/fontmap.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FMAPPRIV_H_
@@ -25,7 +25,7 @@ enum { wxFONTENCODING_UNKNOWN = -2 };
 // the config paths we use
 #if wxUSE_CONFIG
 
-#define FONTMAPPER_ROOT_PATH wxT("/wxWidgets/FontMapper")
+#define FONTMAPPER_ROOT_PATH wxT("/wxWindows/FontMapper")
 #define FONTMAPPER_CHARSET_PATH wxT("Charsets")
 #define FONTMAPPER_CHARSET_ALIAS_PATH wxT("Aliases")