From d3c0ce340237e30bbc03e0e419d5a6d97a04dac6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 26 Feb 2003 19:31:44 +0000 Subject: [PATCH] unified default values for conv arguments git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/ffile.tex | 2 +- docs/latex/wx/file.tex | 2 +- docs/latex/wx/textfile.tex | 6 +++--- include/wx/ffile.h | 2 +- include/wx/file.h | 5 +++-- include/wx/memtext.h | 2 +- include/wx/textbuf.h | 6 +++--- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/docs/latex/wx/ffile.tex b/docs/latex/wx/ffile.tex index c6f9ebabc0..c6638c131a 100644 --- a/docs/latex/wx/ffile.tex +++ b/docs/latex/wx/ffile.tex @@ -203,7 +203,7 @@ Number of bytes written. \membersection{wxFFile::Write}\label{wxffilewrites} -\func{bool}{Write}{\param{const wxString\& }{s}, \param{wxMBConv\&}{ conv = wxConvLibc}} +\func{bool}{Write}{\param{const wxString\& }{s}, \param{wxMBConv\&}{ conv = wxConvUTF8}} Writes the contents of the string to the file, returns true on success. diff --git a/docs/latex/wx/file.tex b/docs/latex/wx/file.tex index d8885f878d..4f8ac4bafc 100644 --- a/docs/latex/wx/file.tex +++ b/docs/latex/wx/file.tex @@ -291,7 +291,7 @@ the number of bytes actually written \membersection{wxFile::Write}\label{wxfilewrites} -\func{bool}{Write}{\param{const wxString\& }{s}, \param{wxMBConv\&}{ conv = wxConvLibc}} +\func{bool}{Write}{\param{const wxString\& }{s}, \param{wxMBConv\&}{ conv = wxConvUTF8}} Writes the contents of the string to the file, returns true on success. diff --git a/docs/latex/wx/textfile.tex b/docs/latex/wx/textfile.tex index 5e37c98308..37cb4bf882 100644 --- a/docs/latex/wx/textfile.tex +++ b/docs/latex/wx/textfile.tex @@ -261,9 +261,9 @@ Insert a line before the line number {\it n}. \membersection{wxTextFile::Open}\label{wxtextfileopen} -\constfunc{bool}{Open}{\param{wxMBConv\&}{ conv = wxConvLibc}} +\constfunc{bool}{Open}{\param{wxMBConv\&}{ conv = wxConvUTF8}} -\constfunc{bool}{Open}{\param{const wxString\& }{strFile}, \param{wxMBConv\&}{ conv = wxConvLibc}} +\constfunc{bool}{Open}{\param{const wxString\& }{strFile}, \param{wxMBConv\&}{ conv = wxConvUTF8}} Open() opens the file with the given name or the name which was given in the \helpref{constructor}{wxtextfilector} and also loads file in memory on @@ -281,7 +281,7 @@ Delete line number {\it n} from the file. \membersection{wxTextFile::Write}\label{wxtextfilewrite} -\constfunc{bool}{Write}{\param{wxTextFileType }{typeNew = wxTextFileType\_None}, \param{wxMBConv\&}{ conv = wxConvLibc}} +\constfunc{bool}{Write}{\param{wxTextFileType }{typeNew = wxTextFileType\_None}, \param{wxMBConv\&}{ conv = wxConvUTF8}} Change the file on disk. The {\it typeNew} parameter allows you to change the file format (default argument means "don't change type") and may be used to diff --git a/include/wx/ffile.h b/include/wx/ffile.h index 3374ed9400..fcc212c96a 100644 --- a/include/wx/ffile.h +++ b/include/wx/ffile.h @@ -67,7 +67,7 @@ public: // returns the number of bytes written size_t Write(const void *pBuf, size_t nCount); // returns true on success - bool Write(const wxString& s, wxMBConv& conv = wxConvLibc) + bool Write(const wxString& s, wxMBConv& conv = wxConvUTF8) { const wxWX2MBbuf buf = s.mb_str(conv); size_t size = strlen(buf); diff --git a/include/wx/file.h b/include/wx/file.h index c11ea4d648..0eaa8c1770 100644 --- a/include/wx/file.h +++ b/include/wx/file.h @@ -100,7 +100,7 @@ public: // returns the number of bytes written size_t Write(const void *pBuf, size_t nCount); // returns true on success - bool Write(const wxString& s, wxMBConv& conv = wxConvLocal) + bool Write(const wxString& s, wxMBConv& conv = wxConvUTF8) { const wxWX2MBbuf buf = s.mb_str(conv); size_t size = strlen(buf); @@ -165,7 +165,8 @@ public: // I/O (both functions return true on success, false on failure) bool Write(const void *p, size_t n) { return m_file.Write(p, n) != 0; } - bool Write(const wxString& str, wxMBConv& conv = wxConvLibc) { return m_file.Write(str, conv); } + bool Write(const wxString& str, wxMBConv& conv = wxConvUTF8) + { return m_file.Write(str, conv); } // different ways to close the file // validate changes and delete the old file of name m_strName diff --git a/include/wx/memtext.h b/include/wx/memtext.h index 92617b24f1..088a503cc1 100644 --- a/include/wx/memtext.h +++ b/include/wx/memtext.h @@ -41,7 +41,7 @@ protected: { return TRUE; } virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew), - wxMBConv& WXUNUSED(conv) = wxConvLibc) + wxMBConv& WXUNUSED(conv) = wxConvUTF8) { return TRUE; } }; diff --git a/include/wx/textbuf.h b/include/wx/textbuf.h index 32d8379a0d..31e7713d93 100644 --- a/include/wx/textbuf.h +++ b/include/wx/textbuf.h @@ -81,10 +81,10 @@ public: bool Create(const wxString& strBufferName); // Open() also loads buffer in memory on success - bool Open(wxMBConv& conv = wxConvISO8859_1); + bool Open(wxMBConv& conv = wxConvUTF8); // same as Open() but with (another) buffer name - bool Open(const wxString& strBufferName, wxMBConv& conv = wxConvISO8859_1); + bool Open(const wxString& strBufferName, wxMBConv& conv = wxConvUTF8); // closes the buffer and frees memory, losing all changes bool Close(); @@ -148,7 +148,7 @@ public: // change the buffer (default argument means "don't change type") // possibly in another format bool Write(wxTextFileType typeNew = wxTextFileType_None, - wxMBConv& conv = wxConvISO8859_1); + wxMBConv& conv = wxConvUTF8); // dtor virtual ~wxTextBuffer(); -- 2.45.2