changed wxFileName::Normalize signature to allow or-combination of flags and reverted...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/filename.tex b/docs/latex/wx/filename.tex
index 36936b7d1cb437b2686cfedf936b7518605dd916..343fb7f1b348995e94fbe277ba9d8e5f8b9c6755 100644 (file)
--- a/docs/latex/wx/filename.tex
+++ b/docs/latex/wx/filename.tex
@@ -522,7 +522,7 @@ otherwise.
 
 \membersection{wxFileName::Normalize}\label{wxfilenamenormalize}
 
-\func{bool}{Normalize}{\param{wxPathNormalize }{flags = wxPATH\_NORM\_ALL}, \param{const wxString\& }{cwd = wxEmptyString}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
+\func{bool}{Normalize}{\param{int }{flags = wxPATH\_NORM\_ALL}, \param{const wxString\& }{cwd = wxEmptyString}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 
 operations on the path
 normalize the path: with the default flags value, the path will be

diff --git a/include/wx/filename.h b/include/wx/filename.h
index 2768f4e0639613f299c165769bd7bb6528966374..ceb0fc820e14b775b4bc072e3e9b59d3e39788c4 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -242,7 +242,7 @@ public:
         // variables will be expanded in it
         //
         // this may be done using another (than current) value of cwd
-    bool Normalize(wxPathNormalize flags = wxPATH_NORM_ALL,
+    bool Normalize(int flags = wxPATH_NORM_ALL,
                    const wxString& cwd = wxEmptyString,
                    wxPathFormat format = wxPATH_NATIVE);
 

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 6e4fe199f635ea194c776e29e491ed3f21a9dd0e..5474b78d004a89c283950999d720bc2c247add30 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -732,7 +732,7 @@ bool wxFileName::Rmdir( const wxString &dir )
 // path normalization
 // ----------------------------------------------------------------------------
 
-bool wxFileName::Normalize(wxPathNormalize flags,
+bool wxFileName::Normalize(int flags,
                            const wxString& cwd,
                            wxPathFormat format)
 {

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index 582160af565301fa297797ea7dc93465b4c3a8e8..fd7b30c50e98b8610514a825b59e5e954b5afb06 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -187,7 +187,8 @@ bool wxTextFile::OnWrite(wxTextFileType typeNew, wxMBConv& conv)
     // We do NOT want wxPATH_NORM_CASE here, or the case will not
     // be preserved.
     if ( !fn.IsAbsolute() )
-        fn.Normalize((wxPathNormalize) (wxPATH_NORM_ENV_VARS | wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG));
+        fn.Normalize(wxPATH_NORM_ENV_VARS | wxPATH_NORM_DOTS | wxPATH_NORM_TILDE |
+                     wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG);
 
     wxTempFile fileTmp(fn.GetFullPath());