unified default values for conv arguments

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-02-26 19:31:44 +00:00
parent 07cc7ddca5
commit d3c0ce3402
7 changed files with 13 additions and 12 deletions

View File

@@ -203,7 +203,7 @@ Number of bytes written.
\membersection{wxFFile::Write}\label{wxffilewrites} \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. Writes the contents of the string to the file, returns true on success.

View File

@@ -291,7 +291,7 @@ the number of bytes actually written
\membersection{wxFile::Write}\label{wxfilewrites} \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. Writes the contents of the string to the file, returns true on success.

View File

@@ -261,9 +261,9 @@ Insert a line before the line number {\it n}.
\membersection{wxTextFile::Open}\label{wxtextfileopen} \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 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 \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} \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 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 file format (default argument means "don't change type") and may be used to

View File

@@ -67,7 +67,7 @@ public:
// returns the number of bytes written // returns the number of bytes written
size_t Write(const void *pBuf, size_t nCount); size_t Write(const void *pBuf, size_t nCount);
// returns true on success // 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); const wxWX2MBbuf buf = s.mb_str(conv);
size_t size = strlen(buf); size_t size = strlen(buf);

View File

@@ -100,7 +100,7 @@ public:
// returns the number of bytes written // returns the number of bytes written
size_t Write(const void *pBuf, size_t nCount); size_t Write(const void *pBuf, size_t nCount);
// returns true on success // 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); const wxWX2MBbuf buf = s.mb_str(conv);
size_t size = strlen(buf); size_t size = strlen(buf);
@@ -165,7 +165,8 @@ public:
// I/O (both functions return true on success, false on failure) // 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 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 // different ways to close the file
// validate changes and delete the old file of name m_strName // validate changes and delete the old file of name m_strName

View File

@@ -41,7 +41,7 @@ protected:
{ return TRUE; } { return TRUE; }
virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew), virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew),
wxMBConv& WXUNUSED(conv) = wxConvLibc) wxMBConv& WXUNUSED(conv) = wxConvUTF8)
{ return TRUE; } { return TRUE; }
}; };

View File

@@ -81,10 +81,10 @@ public:
bool Create(const wxString& strBufferName); bool Create(const wxString& strBufferName);
// Open() also loads buffer in memory on success // 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 // 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 // closes the buffer and frees memory, losing all changes
bool Close(); bool Close();
@@ -148,7 +148,7 @@ public:
// change the buffer (default argument means "don't change type") // change the buffer (default argument means "don't change type")
// possibly in another format // possibly in another format
bool Write(wxTextFileType typeNew = wxTextFileType_None, bool Write(wxTextFileType typeNew = wxTextFileType_None,
wxMBConv& conv = wxConvISO8859_1); wxMBConv& conv = wxConvUTF8);
// dtor // dtor
virtual ~wxTextBuffer(); virtual ~wxTextBuffer();