X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb46a9a6c6f291806a5fecbb848930c344e17e11..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/os2/pnghand.cpp?ds=inline diff --git a/src/os2/pnghand.cpp b/src/os2/pnghand.cpp index c5c3bad288..56cdb1f654 100644 --- a/src/os2/pnghand.cpp +++ b/src/os2/pnghand.cpp @@ -22,17 +22,17 @@ # include #endif -#define INCL_DOS #define INCL_PM -#define INCL_GPI #include + #include "wx/palette.h" #include "wx/bitmap.h" #include "wx/utils.h" + #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)); @@ -56,8 +56,7 @@ extern "C" void png_write_init PNGARG((png_structp png_ptr)); #endif -void -ima_png_error(png_struct *png_ptr, char *message) +void ima_png_error(png_struct *png_ptr, char *message) { // wxMessageBox(message, "PNG error"); @@ -765,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;