From ef92f440977f4aaaf7c252c0646b29e35e2c8b50 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 25 Sep 2003 22:04:53 +0000 Subject: [PATCH] wxPATH_NORM_ALL shouldn't include wxPATH_NORM_CASE git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + docs/latex/wx/filename.tex | 4 ++-- include/wx/filename.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index c1a3f61004..b8d25c07fc 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -62,6 +62,7 @@ All: - wxDateTime::ParseDateTime() implemented (Linus McCabe) - wxHTTP::GetResponse() added (David Nock) - added conversions to/from UTF 16/32 LE/BE (Andreas Pflug) +- wxFileName::Normalize(wxPATH_NORM_ALL) doesn't lower filename case any more All (GUI): diff --git a/docs/latex/wx/filename.tex b/docs/latex/wx/filename.tex index 8b2e26f54d..47d44b6ec0 100644 --- a/docs/latex/wx/filename.tex +++ b/docs/latex/wx/filename.tex @@ -594,10 +594,10 @@ any or-combination of the following constants: \twocolitem{{\bf wxPATH\_NORM\_ENV\_VARS}}{replace env vars with their values} \twocolitem{{\bf wxPATH\_NORM\_DOTS}}{squeeze all .. and . and prepend cwd} \twocolitem{{\bf wxPATH\_NORM\_TILDE}}{Unix only: replace ~ and ~user} -\twocolitem{{\bf wxPATH\_NORM\_CASE}}{if case insensitive => tolower} +\twocolitem{{\bf wxPATH\_NORM\_CASE}}{if filesystem is case insensitive, transform to tolower case} \twocolitem{{\bf wxPATH\_NORM\_ABSOLUTE}}{make the path absolute} \twocolitem{{\bf wxPATH\_NORM\_LONG}}{make the path the long form} -\twocolitem{{\bf wxPATH\_NORM\_ALL}}{all of previous flags} +\twocolitem{{\bf wxPATH\_NORM\_ALL}}{all of previous flags except \texttt{wxPATH\_NORM\_CASE}} \end{twocollist} } diff --git a/include/wx/filename.h b/include/wx/filename.h index 3d549d2b36..d263ddecc2 100644 --- a/include/wx/filename.h +++ b/include/wx/filename.h @@ -72,7 +72,7 @@ enum wxPathNormalize wxPATH_NORM_CASE = 0x0008, // if case insensitive => tolower wxPATH_NORM_ABSOLUTE = 0x0010, // make the path absolute wxPATH_NORM_LONG = 0x0020, // make the path the long form - wxPATH_NORM_ALL = 0x003f + wxPATH_NORM_ALL = 0x003f & ~wxPATH_NORM_CASE }; // what exactly should GetPath() return? -- 2.45.2