projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanups after SciTech commit :-(
[wxWidgets.git]
/
src
/
os2
/
pnghand.cpp
diff --git
a/src/os2/pnghand.cpp
b/src/os2/pnghand.cpp
index 10f0c013aa6fa138825bd8212c40a01eb2c570a2..56cdb1f65456371b6f27130a80cb651b8bd63e1a 100644
(file)
--- a/
src/os2/pnghand.cpp
+++ b/
src/os2/pnghand.cpp
@@
-22,17
+22,17
@@
# include <fstream>
#endif
# include <fstream>
#endif
+#define INCL_PM
+#include <os2.h>
+
#include "wx/palette.h"
#include "wx/bitmap.h"
#include "wx/utils.h"
#include "wx/palette.h"
#include "wx/bitmap.h"
#include "wx/utils.h"
-#define INCL_PM
-#include <os2.h>
-
#include "wx/os2/pngread.h"
extern "C" {
#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));
}
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)
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;
int desiredWidth, int desiredHeight)
{
wxPNGReader reader;