* Fixed Async -> sync in wxExecute
* Added documentation about wxProcess, ... * Added wxDataStream::WriteString and wxDataStream::ReadString git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -116,6 +116,27 @@ wxString wxDataStream::ReadLine()
|
||||
return i_strg;
|
||||
}
|
||||
|
||||
wxString wxDataStream::ReadString()
|
||||
{
|
||||
wxString wx_string;
|
||||
char *string;
|
||||
unsigned long len;
|
||||
|
||||
if (!m_istream)
|
||||
return "";
|
||||
|
||||
len = Read32();
|
||||
string = new char[len+1];
|
||||
|
||||
m_istream->read(string, len);
|
||||
|
||||
string[len] = 0;
|
||||
wx_string = string;
|
||||
delete string;
|
||||
|
||||
return wx_string;
|
||||
}
|
||||
|
||||
void wxDataStream::Write32(unsigned long i)
|
||||
{
|
||||
char buf[4];
|
||||
@@ -152,7 +173,11 @@ void wxDataStream::Write8(unsigned char i)
|
||||
|
||||
void wxDataStream::WriteLine(const wxString& line)
|
||||
{
|
||||
#ifdef __WINDOWS__
|
||||
wxString tmp_string = line + "\r\n";
|
||||
#else
|
||||
wxString tmp_string = line + '\n';
|
||||
#endif
|
||||
|
||||
if (!m_ostream)
|
||||
return;
|
||||
@@ -160,6 +185,15 @@ void wxDataStream::WriteLine(const wxString& line)
|
||||
m_ostream->write((const char *) tmp_string, tmp_string.Length());
|
||||
}
|
||||
|
||||
void wxDataStream::WriteString(const wxString& string)
|
||||
{
|
||||
if (!m_ostream)
|
||||
return;
|
||||
|
||||
Write32(tmp_string.Length());
|
||||
m_ostream->write((const char *) tmp_string, tmp_string.Length());
|
||||
}
|
||||
|
||||
// Must be at global scope for VC++ 5
|
||||
extern "C" void ConvertToIeeeExtended(double num, unsigned char *bytes);
|
||||
|
||||
|
Reference in New Issue
Block a user