configure and #ifdef wxUSE_XXX updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -22,7 +22,9 @@
|
||||
#include "wx/bitmap.h"
|
||||
#include "wx/debug.h"
|
||||
#include "wx/log.h"
|
||||
#ifdef wxUSE_LIBPNG
|
||||
#include "../png/png.h"
|
||||
#endif
|
||||
#include "wx/filefn.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -392,7 +394,9 @@ wxImageHandler *wxImage::FindHandler( long bitmapType )
|
||||
void wxImage::InitStandardHandlers()
|
||||
{
|
||||
AddHandler( new wxBMPHandler );
|
||||
#ifdef wxUSE_LIBPNG
|
||||
AddHandler( new wxPNGHandler );
|
||||
#endif
|
||||
}
|
||||
|
||||
void wxImage::CleanUpHandlers()
|
||||
@@ -430,6 +434,8 @@ bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), const wxString& WXUNUSE
|
||||
// wxPNGHandler
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#ifdef wxUSE_LIBPNG
|
||||
|
||||
#if !USE_SHARED_LIBRARIES
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
|
||||
#endif
|
||||
@@ -655,6 +661,10 @@ bool wxPNGHandler::SaveFile( wxImage *image, const wxString& name )
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
// wxUSE_LIBPNG
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxBMPHandler
|
||||
//-----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user