Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added interface for getting/setting text converter of wxDataInputStream and wxDataOutputStream

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-01-11 19:37:11 +00:00
parent daeb4e4d4c
commit 10c2f98a39
3 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/datstrm.h
View File

@@ -79,6 +79,11 @@ public:
void BigEndianOrdered(bool be_order) { m_be_order = be_order; } void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
#if wxUSE_UNICODE
void SetConv( const wxMBConv &conv );
wxMBConv *GetConv() const { return m_conv; }
#endif
protected: protected:
wxInputStream *m_input; wxInputStream *m_input;
bool m_be_order; bool m_be_order;
@@ -152,6 +157,11 @@ public:
void BigEndianOrdered(bool be_order) { m_be_order = be_order; } void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
#if wxUSE_UNICODE
void SetConv( const wxMBConv &conv );
wxMBConv *GetConv() const { return m_conv; }
#endif
protected: protected:
wxOutputStream *m_output; wxOutputStream *m_output;
bool m_be_order; bool m_be_order;

23
interface/wx/datstrm.h
View File

@@ -58,6 +58,17 @@ public:
*/ */
void BigEndianOrdered(bool be_order); void BigEndianOrdered(bool be_order);
/**
Returns the current text conversion class used for
writing strings.
*/
wxMBConv *GetConv() const;
/**
Sets the text conversion class used for writing strings.
*/
void SetConv( const wxMBConv &conv );
/** /**
Writes the single byte @a i8 to the stream. Writes the single byte @a i8 to the stream.
*/ */
@@ -193,6 +204,13 @@ public:
*/ */
void BigEndianOrdered(bool be_order); void BigEndianOrdered(bool be_order);
/**
Returns the current text conversion class used for
reading strings.
*/
wxMBConv *GetConv() const;
/** /**
Reads a single byte from the stream. Reads a single byte from the stream.
*/ */
@@ -260,5 +278,10 @@ public:
@see wxDataOutputStream::WriteString() @see wxDataOutputStream::WriteString()
*/ */
wxString ReadString(); wxString ReadString();
/**
Sets the text conversion class used for reading strings.
*/
void SetConv( const wxMBConv &conv );
}; };

16
src/common/datstrm.cpp
View File

@@ -45,6 +45,14 @@ wxDataInputStream::~wxDataInputStream()
#endif // wxUSE_UNICODE #endif // wxUSE_UNICODE
} }
#if wxUSE_UNICODE
void wxDataInputStream::SetConv( const wxMBConv &conv )
{
delete m_conv;
m_conv = conv.Clone();
}
#endif
#if wxHAS_INT64 #if wxHAS_INT64
wxUint64 wxDataInputStream::Read64() wxUint64 wxDataInputStream::Read64()
{ {
@@ -473,6 +481,14 @@ wxDataOutputStream::~wxDataOutputStream()
#endif // wxUSE_UNICODE #endif // wxUSE_UNICODE
} }
#if wxUSE_UNICODE
void wxDataOutputStream::SetConv( const wxMBConv &conv )
{
delete m_conv;
m_conv = conv.Clone();
}
#endif
#if wxHAS_INT64 #if wxHAS_INT64
void wxDataOutputStream::Write64(wxUint64 i) void wxDataOutputStream::Write64(wxUint64 i)
{ {