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 37bd783ced2a8564004be2f53ba729bdc20970e6..e1dc683106ab5c7818b9ae32abeea40df001f40b 100644 (file)
--- a/include/wx/fmappriv.h
+++ b/include/wx/fmappriv.h
@@ -25,7 +25,7 @@ enum { wxFONTENCODING_UNKNOWN = -2 };
 // the config paths we use
 #if wxUSE_CONFIG
 
 // 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")
 
 #define FONTMAPPER_CHARSET_PATH wxT("Charsets")
 #define FONTMAPPER_CHARSET_ALIAS_PATH wxT("Aliases")
 


@@ -65,7 +65,7 @@ private:
     bool m_ok;
 
 
     bool m_ok;
 
 

-    DECLARE_NO_COPY_CLASS(wxFontMapperPathChanger)
+    wxDECLARE_NO_COPY_CLASS(wxFontMapperPathChanger);

 };
 
 #endif // wxUSE_CONFIG
 };
 
 #endif // wxUSE_CONFIG