* Added source file info in utils/serialize/*
* Added Windows support in dynlib.cpp (not tested) * Added some operator in wxStream * Added a mutex in thread sample (more later) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
#include <ctype.h>
|
||||
#include <wx/stream.h>
|
||||
#include <wx/datstrm.h>
|
||||
#include <wx/objstrm.h>
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
@@ -270,6 +271,15 @@ wxInputStream& wxInputStream::operator>>(short& i)
|
||||
return *this;
|
||||
}
|
||||
|
||||
wxInputStream& wxInputStream::operator>>(int& i)
|
||||
{
|
||||
long l;
|
||||
|
||||
*this >> l;
|
||||
i = (short)l;
|
||||
return *this;
|
||||
}
|
||||
|
||||
wxInputStream& wxInputStream::operator>>(long& i)
|
||||
{
|
||||
/* I only implemented a simple integer parser */
|
||||
@@ -341,6 +351,13 @@ wxInputStream& wxInputStream::operator>>(float& f)
|
||||
return *this;
|
||||
}
|
||||
|
||||
wxInputStream& wxInputStream::operator>>(wxObject *& obj)
|
||||
{
|
||||
wxObjectInputStream obj_s(*this);
|
||||
obj = obj_s.LoadObject();
|
||||
return *this;
|
||||
}
|
||||
|
||||
off_t wxInputStream::SeekI(off_t pos, wxSeekMode mode)
|
||||
{
|
||||
off_t ret_off;
|
||||
@@ -504,6 +521,13 @@ wxOutputStream& wxOutputStream::operator<<(double f)
|
||||
return Write(strfloat, strfloat.Len());
|
||||
}
|
||||
|
||||
wxOutputStream& wxOutputStream::operator<<(wxObject& obj)
|
||||
{
|
||||
wxObjectOutputStream obj_s(*this);
|
||||
obj_s.SaveObject(obj);
|
||||
return *this;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxFilterInputStream
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user