Updated testconf,
Compile fixes for docview and iostreams, SO_RCVTIMEO doesn't exist everywhere and must not be used for setting this option - only getting it on some systems Distrib things git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -22,10 +22,10 @@
|
||||
class DoodleLine: public wxObject
|
||||
{
|
||||
public:
|
||||
long x1;
|
||||
long y1;
|
||||
long x2;
|
||||
long y2;
|
||||
wxInt32 x1;
|
||||
wxInt32 y1;
|
||||
wxInt32 x2;
|
||||
wxInt32 y2;
|
||||
};
|
||||
|
||||
// Contains a list of lines: represents a mouse-down doodle
|
||||
@@ -39,8 +39,14 @@ class DoodleSegment: public wxObject
|
||||
~DoodleSegment(void);
|
||||
|
||||
void Draw(wxDC *dc);
|
||||
ostream& SaveObject(ostream& stream);
|
||||
istream& LoadObject(istream& stream);
|
||||
|
||||
#if wxUSE_STD_IOSTREAM
|
||||
ostream& SaveObject(ostream& text_stream);
|
||||
istream& LoadObject(istream& text_stream);
|
||||
#else
|
||||
wxOutputStream& SaveObject(wxOutputStream& stream);
|
||||
wxInputStream& LoadObject(wxInputStream& stream);
|
||||
#endif
|
||||
};
|
||||
|
||||
class DrawingDocument: public wxDocument
|
||||
@@ -53,8 +59,13 @@ class DrawingDocument: public wxDocument
|
||||
DrawingDocument(void);
|
||||
~DrawingDocument(void);
|
||||
|
||||
ostream& SaveObject(ostream& stream);
|
||||
istream& LoadObject(istream& stream);
|
||||
#if wxUSE_STD_IOSTREAM
|
||||
ostream& SaveObject(ostream& text_stream);
|
||||
istream& LoadObject(istream& text_stream);
|
||||
#else
|
||||
wxOutputStream& SaveObject(wxOutputStream& stream);
|
||||
wxInputStream& LoadObject(wxInputStream& stream);
|
||||
#endif
|
||||
|
||||
inline wxList& GetDoodleSegments(void) const { return (wxList&) doodleSegments; };
|
||||
};
|
||||
|
Reference in New Issue
Block a user