* Bug fixes

* Changed wxObjectOutputStream::AddChildren() to AddChild()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/file.h b/include/wx/file.h
index a12d35550755e4a72e7a7de155d1ee51f20b97e4..11d935dacc5c9f22b87ca1a40802a77e50b004b9 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -24,9 +24,6 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-// error return value for Seek() functions
-const off_t ofsInvalid = (off_t)-1;
-

 // we redefine these constants here because S_IREAD &c are _not_ standard
 // however, we do assume that the values correspond to the Unix umask bits
 #define wxS_IRUSR 00400
 // we redefine these constants here because S_IREAD &c are _not_ standard
 // however, we do assume that the values correspond to the Unix umask bits
 #define wxS_IRUSR 00400


@@ -118,7 +115,7 @@ public:
   bool Error() const { return m_error; }
 
   // dtor closes the file if opened
   bool Error() const { return m_error; }
 
   // dtor closes the file if opened

- ~wxFile();
+  virtual ~wxFile(); // Temporally virtual because of wxFileStream: I'll change back in a near future.

 
 private:
   // copy ctor and assignment operator are private because
 
 private:
   // copy ctor and assignment operator are private because

diff --git a/include/wx/objstrm.h b/include/wx/objstrm.h
index a2fe96082cea9ed1fc3261cb1194a104a712c2e9..dd6f56e710c802d1f97f003bc4c13049821bf024 100644 (file)
--- a/include/wx/objstrm.h
+++ b/include/wx/objstrm.h
@@ -33,7 +33,7 @@ class wxObjectOutputStream : public wxFilterOutputStream {
  public:
   wxObjectOutputStream(wxOutputStream& s);
 
  public:
   wxObjectOutputStream(wxOutputStream& s);
 

-  void AddChildren(wxObject *obj);
+  void AddChild(wxObject *obj);

   bool SaveObject(wxObject& obj);
 
   bool FirstStage() const { return m_stage == 0; }
   bool SaveObject(wxObject& obj);
 
   bool FirstStage() const { return m_stage == 0; }

diff --git a/src/Makefile.in b/src/Makefile.in
index 7ea8c41e02dddc894e22fe0dbe6b1a634152fa12..2a0ce6cd7df464c05156d6a8aa0ec2897559418d 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -56,6 +56,8 @@ LIB_CPP_SRC=\
  common/time.cpp \
  common/timercmn.cpp \
  common/utilscmn.cpp \
  common/time.cpp \
  common/timercmn.cpp \
  common/utilscmn.cpp \

+ common/wincmn.cpp \
+ common/framecmn.cpp \

  common/stream.cpp \
  common/datstrm.cpp \
  common/fstream.cpp \
  common/stream.cpp \
  common/datstrm.cpp \
  common/fstream.cpp \

diff --git a/src/common/objstrm.cpp b/src/common/objstrm.cpp
index 07210b388a709c55163c34537fa988ae8981491a..935d6fe08c96748e513b231086f10eb0978f9b96 100644 (file)
--- a/src/common/objstrm.cpp
+++ b/src/common/objstrm.cpp
@@ -48,7 +48,7 @@ void wxObjectOutputStream::WriteObjectDef(wxObjectStreamInfo& info)
   data_s.Write8(info.children.Number());
 }
 
   data_s.Write8(info.children.Number());
 }
 

-void wxObjectOutputStream::AddChildren(wxObject *obj)
+void wxObjectOutputStream::AddChild(wxObject *obj)

 {
   wxObjectStreamInfo *info;
 
 {
   wxObjectStreamInfo *info;
 

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 85b95b59e371c4aca6d42da9a1c3133e960999a9..ea64071eb7e5018c149d1cdc252a79e468b8e31a 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -17,7 +17,7 @@
 #include <wx/stream.h>
 #include <wx/zstream.h>
 #include <wx/utils.h>
 #include <wx/stream.h>
 #include <wx/zstream.h>
 #include <wx/utils.h>

-#include "../zlib/zlib.h"
+#include "zlib.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/src/gtk/setup/maketmpl.in b/src/gtk/setup/maketmpl.in
index 540aede6b947dc1612bf92151aa084a08efc0cc4..2bdb97d831a89ffb690d70cfd3459f30cad9bf30 100644 (file)
--- a/src/gtk/setup/maketmpl.in
+++ b/src/gtk/setup/maketmpl.in
@@ -95,6 +95,7 @@ $(TOOLKIT_DEF) \
 -I. \
 -I.. \
 -I$(WXBASEDIR)/include \
 -I. \
 -I.. \
 -I$(WXBASEDIR)/include \

+-I$(WXBASEDIR)/src/zlib \

 $(GUI_TK_INCLUDE) \
 $(OPENGL_INCLUDE) \
 $(X_CFLAGS)
 $(GUI_TK_INCLUDE) \
 $(OPENGL_INCLUDE) \
 $(X_CFLAGS)

diff --git a/src/gtk1/setup/maketmpl.in b/src/gtk1/setup/maketmpl.in
index 540aede6b947dc1612bf92151aa084a08efc0cc4..2bdb97d831a89ffb690d70cfd3459f30cad9bf30 100644 (file)
--- a/src/gtk1/setup/maketmpl.in
+++ b/src/gtk1/setup/maketmpl.in
@@ -95,6 +95,7 @@ $(TOOLKIT_DEF) \
 -I. \
 -I.. \
 -I$(WXBASEDIR)/include \
 -I. \
 -I.. \
 -I$(WXBASEDIR)/include \

+-I$(WXBASEDIR)/src/zlib \

 $(GUI_TK_INCLUDE) \
 $(OPENGL_INCLUDE) \
 $(X_CFLAGS)
 $(GUI_TK_INCLUDE) \
 $(OPENGL_INCLUDE) \
 $(X_CFLAGS)