diff options
| author | Graeme Geldenhuys <graemeg@gmail.com> | 2015-04-10 11:35:59 +0100 |
|---|---|---|
| committer | Graeme Geldenhuys <graemeg@gmail.com> | 2015-04-10 11:35:59 +0100 |
| commit | ac1ade3e6c4c01e6e1137ab1514899e05169538e (patch) | |
| tree | 100557240a04c2f3c827d3b2d52ab9e671d6a9ac /src/corelib/fpg_imgfmt_png.pas | |
| parent | db31f06d5e7adf28fad60e36fd9e5d2cf0519e84 (diff) | |
| download | fpGUI-ac1ade3e6c4c01e6e1137ab1514899e05169538e.tar.xz | |
WinCE: fixes compilation errors for WinCE-ARM
* Disabled OLE support for WinCE
* Disabled Drag-n-Drop support for WinCE
* Fixed PChar vs PWidechar types
* Fixed IFDEF's. Differences between MSWINDOWS, WINDOWS and WINCE.
Diffstat (limited to 'src/corelib/fpg_imgfmt_png.pas')
| -rw-r--r-- | src/corelib/fpg_imgfmt_png.pas | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/fpg_imgfmt_png.pas b/src/corelib/fpg_imgfmt_png.pas index 3148a5b4..c4ee504f 100644 --- a/src/corelib/fpg_imgfmt_png.pas +++ b/src/corelib/fpg_imgfmt_png.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2014 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2015 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -32,7 +32,7 @@ uses function LoadImage_PNG(const AFileName: TfpgString): TfpgImage; overload; function LoadImage_PNG(AStream: TStream): TfpgImage; overload; function LoadImage_PNG(const AImageData: Pointer; const AImageDataSize: LongWord): TfpgImage; overload; -function LoadImage_PNG(AInstance: THandle; const AResName: String; AResType: PChar): TfpgImage; overload; +function LoadImage_PNG(AInstance: THandle; const AResName: String; AResType: {$IFNDEF WINCE} PChar {$ELSE} PWideChar{$ENDIF}): TfpgImage; overload; function LoadImage_PNGcrop(const AMaxWidth, AMaxHeight: integer; const AFileName: TfpgString): TfpgImage; @@ -134,7 +134,7 @@ begin end; end; -function LoadImage_PNG(AInstance: THandle; const AResName: String; AResType: PChar): TfpgImage; +function LoadImage_PNG(AInstance: THandle; const AResName: String; AResType: {$IFNDEF WINCE} PChar {$ELSE} PWideChar{$ENDIF}): TfpgImage; var res: TResourceStream; begin |