* Bug fixes

* Changed wxObjectOutputStream::AddChildren() to AddChild() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-07-27 17:08:49 +00:00
parent 0757d27c1e
commit 1eac776c03
7 changed files with 8 additions and 7 deletions
--- 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/wincmn.cpp \
+ common/framecmn.cpp \
 common/stream.cpp \
 common/datstrm.cpp \
 common/fstream.cpp \
--- 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());
 }

-void wxObjectOutputStream::AddChildren(wxObject *obj)
+void wxObjectOutputStream::AddChild(wxObject *obj)
 {
  wxObjectStreamInfo *info;

--- 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 "../zlib/zlib.h"
+#include "zlib.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/src/gtk/setup/maketmpl.in
+++ b/src/gtk/setup/maketmpl.in
@@ -95,6 +95,7 @@ $(TOOLKIT_DEF) \
 -I. \
 -I.. \
 -I$(WXBASEDIR)/include \
+-I$(WXBASEDIR)/src/zlib \
 $(GUI_TK_INCLUDE) \
 $(OPENGL_INCLUDE) \
 $(X_CFLAGS)
--- a/src/gtk1/setup/maketmpl.in
+++ b/src/gtk1/setup/maketmpl.in
@@ -95,6 +95,7 @@ $(TOOLKIT_DEF) \
 -I. \
 -I.. \
 -I$(WXBASEDIR)/include \
+-I$(WXBASEDIR)/src/zlib \
 $(GUI_TK_INCLUDE) \
 $(OPENGL_INCLUDE) \
 $(X_CFLAGS)