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
1999-08-01 11:02:05 +00:00
parent f439844be2
commit 23a54e14a7
13 changed files with 556 additions and 80 deletions
--- a/samples/docview/doc.cpp
+++ b/samples/docview/doc.cpp
@@ -47,8 +47,10 @@ DrawingDocument::~DrawingDocument(void)
 ostream& DrawingDocument::SaveObject(ostream& stream)
 {
  wxDocument::SaveObject(stream);
-
-  stream << doodleSegments.Number() << '\n';
+  
+  wxInt32 n = doodleSegments.Number();
+  stream << n << '\n';
+  
  wxNode *node = doodleSegments.First();
  while (node)
  {
@@ -58,28 +60,30 @@ ostream& DrawingDocument::SaveObject(ostream& stream)
    
    node = node->Next();
  }
+  
  return stream;
 }
 #else
-bool DrawingDocument::SaveObject(wxOutputStream &stream)
+wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
 {
  wxDocument::SaveObject(stream);
-  
+
  wxTextOutputStream text_stream( stream );

  wxInt32 n = doodleSegments.Number();
-  text_stream << n << "\n";
+  text_stream << n << '\n';
  
  wxNode *node = doodleSegments.First();
  while (node)
  {
    DoodleSegment *segment = (DoodleSegment *)node->Data();
    segment->SaveObject(stream);
-    text_stream << "\n";
+    text_stream << '\n';
    
    node = node->Next();
  }
-  return TRUE;
+  
+  return stream;
 }
 #endif

@@ -87,8 +91,8 @@ bool DrawingDocument::SaveObject(wxOutputStream &stream)
 istream& DrawingDocument::LoadObject(istream& stream)
 {
  wxDocument::LoadObject(stream);
-
-  int n = 0;
+  
+  wxInt32 n = 0;
  stream >> n;

  for (int i = 0; i < n; i++)
@@ -101,12 +105,12 @@ istream& DrawingDocument::LoadObject(istream& stream)
  return stream;
 }
 #else
-bool DrawingDocument::LoadObject(wxInputStream& stream)
+wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
 {
  wxDocument::LoadObject(stream);

  wxTextInputStream text_stream( stream );
-  
+
  wxInt32 n = 0;
  text_stream >> n;

@@ -117,7 +121,7 @@ bool DrawingDocument::LoadObject(wxInputStream& stream)
    doodleSegments.Append(segment);
  }

-  return TRUE;
+  return stream;
 }
 #endif

@@ -151,23 +155,29 @@ DoodleSegment::~DoodleSegment(void)
 #if wxUSE_STD_IOSTREAM
 ostream& DoodleSegment::SaveObject(ostream& stream)
 {
-  stream << lines.Number() << '\n';
+  wxInt32 n = lines.Number();
+  stream << n << '\n';
+  
  wxNode *node = lines.First();
  while (node)
  {
    DoodleLine *line = (DoodleLine *)node->Data();
-    stream << line->x1 << " " << line->y1 << " " << line->x2 << " " << line->y2 << "\n";
+    stream << line->x1 << " " << 
+                   line->y1 << " " << 
+		   line->x2 << " " << 
+		   line->y2 << "\n";
    node = node->Next();
  }
+
  return stream;
 }
 #else
-bool DoodleSegment::SaveObject(wxOutputStream& stream)
+wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
 {
  wxTextOutputStream text_stream( stream );

  wxInt32 n = lines.Number();
-  text_stream << n << "\n";
+  text_stream << n << '\n';
  
  wxNode *node = lines.First();
  while (node)
@@ -179,29 +189,34 @@ bool DoodleSegment::SaveObject(wxOutputStream& stream)
 		   line->y2 << "\n";
    node = node->Next();
  }
-  return TRUE;
+
+  return stream;
 }
 #endif

 #if wxUSE_STD_IOSTREAM
 istream& DoodleSegment::LoadObject(istream& stream)
 {
-  int n = 0;
+  wxInt32 n = 0;
  stream >> n;

  for (int i = 0; i < n; i++)
  {
    DoodleLine *line = new DoodleLine;
-    stream >> line->x1 >> line->y1 >> line->x2 >> line->y2;
+    stream >> line->x1 >> 
+                   line->y1 >> 
+		   line->x2 >> 
+		   line->y2;
    lines.Append(line);
  }
+  
  return stream;
 }
 #else
-bool DoodleSegment::LoadObject(wxInputStream& stream)
+wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream)
 {
  wxTextInputStream text_stream( stream );
-  
+
  wxInt32 n = 0;
  text_stream >> n;

@@ -214,7 +229,8 @@ bool DoodleSegment::LoadObject(wxInputStream& stream)
 		   line->y2;
    lines.Append(line);
  }
-  return TRUE;
+  
+  return stream;
 }
 #endif

--- a/samples/docview/doc.h
+++ b/samples/docview/doc.h
@@ -40,11 +40,11 @@ class DoodleSegment: public wxObject

  void Draw(wxDC *dc);
 #if wxUSE_STD_IOSTREAM
-  ostream& SaveObject(ostream& stream);
-  istream& LoadObject(istream& stream);
+  ostream& SaveObject(ostream& text_stream);
+  istream& LoadObject(istream& text_stream);
 #else
-  bool SaveObject(wxOutputStream& stream);
-  bool LoadObject(wxInputStream& stream);
+  wxOutputStream& SaveObject(wxOutputStream& stream);
+  wxInputStream& LoadObject(wxInputStream& stream);
 #endif

 };
@@ -60,11 +60,11 @@ class DrawingDocument: public wxDocument
  ~DrawingDocument(void);

 #if wxUSE_STD_IOSTREAM
-  ostream& SaveObject(ostream& stream);
-  istream& LoadObject(istream& stream);
+  ostream& SaveObject(ostream& text_stream);
+  istream& LoadObject(istream& text_stream);
 #else
-  bool SaveObject(wxOutputStream& stream);
-  bool LoadObject(wxInputStream& stream);
+  wxOutputStream& SaveObject(wxOutputStream& stream);
+  wxInputStream& LoadObject(wxInputStream& stream);
 #endif

  inline wxList& GetDoodleSegments(void) const { return (wxList&) doodleSegments; };
--- a/samples/docvwmdi/doc.cpp
+++ b/samples/docvwmdi/doc.cpp
@@ -23,6 +23,7 @@
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
+#include "wx/txtstrm.h"

 #if !wxUSE_DOC_VIEW_ARCHITECTURE
 #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
@@ -42,11 +43,14 @@ DrawingDocument::~DrawingDocument(void)
  doodleSegments.DeleteContents(TRUE);
 }

+#if wxUSE_STD_IOSTREAM
 ostream& DrawingDocument::SaveObject(ostream& stream)
 {
  wxDocument::SaveObject(stream);
-
-  stream << doodleSegments.Number() << '\n';
+  
+  wxInt32 n = doodleSegments.Number();
+  stream << n << '\n';
+  
  wxNode *node = doodleSegments.First();
  while (node)
  {
@@ -56,14 +60,39 @@ ostream& DrawingDocument::SaveObject(ostream& stream)
    
    node = node->Next();
  }
+  
  return stream;
 }
+#else
+wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
+{
+  wxDocument::SaveObject(stream);

+  wxTextOutputStream text_stream( stream );
+
+  wxInt32 n = doodleSegments.Number();
+  text_stream << n << '\n';
+  
+  wxNode *node = doodleSegments.First();
+  while (node)
+  {
+    DoodleSegment *segment = (DoodleSegment *)node->Data();
+    segment->SaveObject(stream);
+    text_stream << '\n';
+    
+    node = node->Next();
+  }
+  
+  return stream;
+}
+#endif
+
+#if wxUSE_STD_IOSTREAM
 istream& DrawingDocument::LoadObject(istream& stream)
 {
  wxDocument::LoadObject(stream);
-
-  int n = 0;
+  
+  wxInt32 n = 0;
  stream >> n;

  for (int i = 0; i < n; i++)
@@ -75,7 +104,26 @@ istream& DrawingDocument::LoadObject(istream& stream)

  return stream;
 }
+#else
+wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
+{
+  wxDocument::LoadObject(stream);

+  wxTextInputStream text_stream( stream );
+
+  wxInt32 n = 0;
+  text_stream >> n;
+
+  for (int i = 0; i < n; i++)
+  {
+    DoodleSegment *segment = new DoodleSegment;
+    segment->LoadObject(stream);
+    doodleSegments.Append(segment);
+  }
+
+  return stream;
+}
+#endif
 DoodleSegment::DoodleSegment(void)
 {
 }
@@ -103,33 +151,87 @@ DoodleSegment::~DoodleSegment(void)
  lines.DeleteContents(TRUE);
 }

+#if wxUSE_STD_IOSTREAM
 ostream& DoodleSegment::SaveObject(ostream& stream)
 {
-  stream << lines.Number() << '\n';
+  wxInt32 n = lines.Number();
+  stream << n << '\n';
+  
  wxNode *node = lines.First();
  while (node)
  {
    DoodleLine *line = (DoodleLine *)node->Data();
-    stream << line->x1 << " " << line->y1 << " " << line->x2 << " " << line->y2 << "\n";
+    stream << line->x1 << " " << 
+                   line->y1 << " " << 
+		   line->x2 << " " << 
+		   line->y2 << "\n";
    node = node->Next();
  }
+
  return stream;
 }
+#else
+wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
+{
+  wxTextOutputStream text_stream( stream );

+  wxInt32 n = lines.Number();
+  text_stream << n << '\n';
+  
+  wxNode *node = lines.First();
+  while (node)
+  {
+    DoodleLine *line = (DoodleLine *)node->Data();
+    text_stream << line->x1 << " " << 
+                   line->y1 << " " << 
+		   line->x2 << " " << 
+		   line->y2 << "\n";
+    node = node->Next();
+  }
+
+  return stream;
+}
+#endif
+
+#if wxUSE_STD_IOSTREAM
 istream& DoodleSegment::LoadObject(istream& stream)
 {
-  int n = 0;
+  wxInt32 n = 0;
  stream >> n;

  for (int i = 0; i < n; i++)
  {
    DoodleLine *line = new DoodleLine;
-    stream >> line->x1 >> line->y1 >> line->x2 >> line->y2;
+    stream >> line->x1 >> 
+                   line->y1 >> 
+		   line->x2 >> 
+		   line->y2;
    lines.Append(line);
  }
+  
  return stream;
 }
+#else
+wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream)
+{
+  wxTextInputStream text_stream( stream );

+  wxInt32 n = 0;
+  text_stream >> n;
+
+  for (int i = 0; i < n; i++)
+  {
+    DoodleLine *line = new DoodleLine;
+    text_stream >> line->x1 >> 
+                   line->y1 >> 
+		   line->x2 >> 
+		   line->y2;
+    lines.Append(line);
+  }
+  
+  return stream;
+}
+#endif
 void DoodleSegment::Draw(wxDC *dc)
 {
  wxNode *node = lines.First();
--- a/samples/docvwmdi/doc.h
+++ b/samples/docvwmdi/doc.h
@@ -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; };
 };