moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

[wxWidgets.git] / include / wx / zstream.h

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 75af3270c857caee9ab3a9236f73d97b55f0f854..3cac08f9459c9a67f05952a580201054a7e218ce 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -15,11 +15,11 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "defs.h"
+#include "wx/defs.h"

 
 

-#ifdef wxUSE_ZLIB
+#if wxUSE_ZLIB && wxUSE_STREAMS

 
 

-#include <wx/stream.h>
+#include "wx/stream.h"

 
 class WXDLLEXPORT wxZlibInputStream: public wxFilterInputStream {
  public:
 
 class WXDLLEXPORT wxZlibInputStream: public wxFilterInputStream {
  public:


@@ -37,7 +37,7 @@ class WXDLLEXPORT wxZlibInputStream: public wxFilterInputStream {
 
 class WXDLLEXPORT wxZlibOutputStream: public wxFilterOutputStream {
  public:
 
 class WXDLLEXPORT wxZlibOutputStream: public wxFilterOutputStream {
  public:

-  wxZlibOutputStream(wxOutputStream& stream);
+  wxZlibOutputStream(wxOutputStream& stream, int level = -1);

   virtual ~wxZlibOutputStream();
 
   void Sync();
   virtual ~wxZlibOutputStream();
 
   void Sync();


@@ -52,5 +52,8 @@ class WXDLLEXPORT wxZlibOutputStream: public wxFilterOutputStream {
 };
 
 #endif
 };
 
 #endif

+  // wxUSE_ZLIB && wxUSE_STREAMS

 
 #endif
 
 #endif

+   // _WX_WXZSTREAM_H__
+