X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43543d985b04d065178df50dbbc998786ff97282..c43430bbacbf26414693fcf47fe54a8090c6bfcb:/src/os2/pnghand.cpp diff --git a/src/os2/pnghand.cpp b/src/os2/pnghand.cpp index 10f0c013aa..56cdb1f654 100644 --- a/src/os2/pnghand.cpp +++ b/src/os2/pnghand.cpp @@ -22,17 +22,17 @@ # include #endif +#define INCL_PM +#include + #include "wx/palette.h" #include "wx/bitmap.h" #include "wx/utils.h" -#define INCL_PM -#include - #include "wx/os2/pngread.h" extern "C" { -#include "../png/png.h" +#include "png.h" } extern "C" void png_read_init PNGARG((png_structp png_ptr)); @@ -764,7 +764,7 @@ bool wxPNGReader::SaveXPM(wxChar *filename, wxChar *name) IMPLEMENT_DYNAMIC_CLASS(wxPNGFileHandler, wxBitmapHandler) -bool wxPNGFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, +bool wxPNGFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, HPS hPs, long flags, int desiredWidth, int desiredHeight) { wxPNGReader reader;