Revert HasModifiers() change in behaviour, add HasAnyModifiers().

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

diff --git a/include/wx/fmappriv.h b/include/wx/fmappriv.h
index a6b59d8ca3aed5813af65de9a7d089ab8c8d2b4d..e1dc683106ab5c7818b9ae32abeea40df001f40b 100644 (file)
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -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
 {
@@ -65,7 +65,7 @@ private:
     bool m_ok;
 
 
-    DECLARE_NO_COPY_CLASS(wxFontMapperPathChanger)
+    wxDECLARE_NO_COPY_CLASS(wxFontMapperPathChanger);
 };
 
 #endif // wxUSE_CONFIG