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:
Robert Roebling
1999-06-15 20:21:59 +00:00
parent dcf924a345
commit ce4169a4d1
88 changed files with 1125 additions and 698 deletions

View File

@@ -10,10 +10,6 @@
/*
We don't put pragma implement in this file because it is already present in
src/common/image.cpp
#ifdef __GNUG__
#pragma implementation "image.h"
#endif
*/
// For compilers that support precompilation, includes "wx.h".
@@ -23,16 +19,18 @@
#pragma hdrstop
#endif
#include "wx/defs.h"
#if wxUSE_LIBJPEG
#include "wx/image.h"
#include "wx/bitmap.h"
#include "wx/debug.h"
#include "wx/log.h"
#include "wx/app.h"
#if wxUSE_LIBJPEG
extern "C" {
#include "../jpeg/jpeglib.h"
extern "C" {
#include "jpeglib.h"
}
#endif
#include "wx/filefn.h"
#include "wx/wfstream.h"
#include "wx/intl.h"
@@ -57,15 +55,12 @@ extern "C" {
// wxJPEGHandler
//-----------------------------------------------------------------------------
#if wxUSE_LIBJPEG
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler)
#endif
#if wxUSE_STREAMS
//------------- JPEG Data Source Manager
typedef struct {
@@ -310,12 +305,12 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream )
return TRUE;
}
#endif // wxUSE_STREAMS
#endif
// wxUSE_LIBJPEG
#endif
// wxUSE_STREAMS
#endif
// wxUSE_LIBJPEG