Added a few #if wxUSE_XXX
Regrouped image format handlers Updated the rest accordingly Added changes.txt for wxGTK git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
// Copyright: (c) Guilhem Lavaux
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "zstream.h"
|
||||
#endif
|
||||
@@ -15,18 +16,21 @@
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/defs.h"
|
||||
#endif
|
||||
|
||||
#if wxUSE_ZLIB && wxUSE_STREAMS
|
||||
|
||||
#include "wx/zstream.h"
|
||||
|
||||
#if wxUSE_ZLIB
|
||||
|
||||
#include "wx/utils.h"
|
||||
#include "wx/intl.h"
|
||||
#include "wx/log.h"
|
||||
#include "../zlib/zlib.h" // don't change this, Robert
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
#include "zlib.h"
|
||||
|
||||
#define ZSTREAM_BUFFER_SIZE 1024
|
||||
|
||||
@@ -186,6 +190,5 @@ size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
// wxUSE_ZLIB
|
||||
// wxUSE_ZLIB && wxUSE_STREAMS
|
||||
|
||||
|
||||
Reference in New Issue
Block a user