X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2478fde622a16d25c66690af353dfdc37e7b582..6033bbc1ff95fb69b65b081d03b4a679dd958e75:/include/wx/fmappriv.h

diff --git a/include/wx/fmappriv.h b/include/wx/fmappriv.h
index a6b59d8ca3..37bd783ced 100644
--- a/include/wx/fmappriv.h
+++ b/include/wx/fmappriv.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     21.06.2003 (extracted from common/fontmap.cpp)
 // RCS-ID:      $Id$
-// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -25,7 +25,7 @@ enum { wxFONTENCODING_UNKNOWN = -2 };
 // the config paths we use
 #if wxUSE_CONFIG
 
-#define FONTMAPPER_ROOT_PATH wxT("/wxWindows/FontMapper")
+#define FONTMAPPER_ROOT_PATH wxT("/wxWidgets/FontMapper")
 #define FONTMAPPER_CHARSET_PATH wxT("Charsets")
 #define FONTMAPPER_CHARSET_ALIAS_PATH wxT("Aliases")
 
@@ -35,7 +35,7 @@ enum { wxFONTENCODING_UNKNOWN = -2 };
 // wxFontMapperPathChanger: change the config path during our lifetime
 // ----------------------------------------------------------------------------
 
-#if wxUSE_CONFIG
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
 
 class wxFontMapperPathChanger
 {