Only include/build pnghand if the user builds the png library (avoids multiple build errors)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -9,12 +9,16 @@
|
|||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#ifndef _WX_PNGHAND_H_
|
||||||
|
#define _WX_PNGHAND_H_
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||||
#pragma interface "pnghand.h"
|
#pragma interface "pnghand.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef _WX_PNGHAND_H_
|
#include "wx/defs.h"
|
||||||
#define _WX_PNGHAND_H_
|
|
||||||
|
#if wxUSE_PNGLIB
|
||||||
|
|
||||||
class WXDLLEXPORT wxPNGFileHandler: public wxBitmapHandler
|
class WXDLLEXPORT wxPNGFileHandler: public wxBitmapHandler
|
||||||
{
|
{
|
||||||
@@ -32,6 +36,8 @@ public:
|
|||||||
virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
|
virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#endif //wxUSE_LIBPNG
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
// _WX_PNGHAND_H_
|
// _WX_PNGHAND_H_
|
||||||
|
|
||||||
|
@@ -21,6 +21,8 @@
|
|||||||
# pragma hdrstop
|
# pragma hdrstop
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if wxUSE_LIBPNG
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@@ -902,3 +904,4 @@ bool wxPNGFileHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, in
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif //wxUSE_LIBPNG
|
||||||
|
Reference in New Issue
Block a user