Removed child frame CreateStatusBar from MDI sample; renamed config.h to confbase.h;

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

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 76734083d2cb483eb71711ad60968bb1f34c5627..6d68c5fc75b0849ae98b3ea4e8a2e27f524a82da 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -8,15 +8,15 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __WXZSTREAM_H__
-#define __WXZSTREAM_H__
+#ifndef _WX_WXZSTREAM_H__
+#define _WX_WXZSTREAM_H__

 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include <wx/stream.h>
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include <wx/stream.h>

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

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


@@ -27,7 +27,7 @@ class wxZlibInputStream: public wxFilterInputStream {
 
  protected:
   size_t DoRead(void *buffer, size_t size);
 
  protected:
   size_t DoRead(void *buffer, size_t size);

-  off_t DoSeekInput(off_t pos, wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; }
+  off_t DoSeekInput(off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; }

   off_t DoTellInput() const { return wxInvalidOffset; }
 
  protected:
   off_t DoTellInput() const { return wxInvalidOffset; }
 
  protected:


@@ -47,7 +47,7 @@ class wxZlibOutputStream: public wxFilterOutputStream {
 
  protected:
   size_t DoWrite(const void *buffer, size_t size);
 
  protected:
   size_t DoWrite(const void *buffer, size_t size);

-  off_t DoSeekOutput(off_t pos, wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; }
+  off_t DoSeekOutput(off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; }

   off_t DoTellOutput() const { return wxInvalidOffset; }
 
  protected:
   off_t DoTellOutput() const { return wxInvalidOffset; }
 
  protected: