Disables gdi images when using the lcl and some other small changes

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1731 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2011-07-01 13:44:38 +00:00
parent 3b5a5ff113
commit 7e5e08146b
5 changed files with 11 additions and 9 deletions

View File

@ -16,7 +16,7 @@ uses
Graphics;
var
GDIPlusActive: boolean;
GDIPlusActive: boolean = False;
type
TGpImage = class(TObject)

View File

@ -7,9 +7,9 @@ unit HtmlComp;
interface
uses
HtmlCompReg, URLSubs, DitherUnit, FramBrwz, FramView, GDIPL2A,
HtmlGif1, HTMLGif2, HtmlMisc, Htmlsbs1, Htmlsubs, HTMLUn2, Htmlview,
Readhtml, StylePars, StyleUn, LazarusPackageIntf;
HtmlCompReg, URLSubs, DitherUnit, FramBrwz, FramView, GDIPL2A, HtmlGif1,
HTMLGif2, HtmlMisc, Htmlsbs1, Htmlsubs, htmlun2, htmlview, Readhtml,
StylePars, StyleUn, LazarusPackageIntf;
implementation

View File

@ -119,6 +119,7 @@
{$ENDIF}
{$IFDEF MSWINDOWS}
{$IFDEF LCL}{$Define NoGDIPlus}{$ENDIF}
{.$Define NoGDIPlus} {The gdiplus.dll provides Alpha transparency support for
PNG images. If, for some reason the use of the gdiplus.dll is
undesirable, define "NoGDIPlus" by removing the '.'. Defining both

View File

@ -28,16 +28,17 @@ URLCON.PAS are covered by separate copyright notices located in those modules.
{$i htmlcons.inc}
unit HTMLUn2;
unit htmlun2;
interface
uses
SysUtils, Classes,
{$IFNDEF LCL}
Windows, Messages,
{$ELSE}
LclIntf, LMessages, Types, LclType, LResources, IntfGraphics, HtmlMisc,
{$ENDIF}
{$ENDIF}
Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, Clipbrd,
StyleUn, GDIPL2A;
@ -485,7 +486,7 @@ function GetImageWidth(Image: TGpObject): integer;
implementation
uses
{$IFNDEF LCL} jpeg, {$ENDIF} DitherUnit,
{$IFNDEF LCL} jpeg, {$ENDIF} DitherUnit,
{$ifndef NoOldPng}
PngImage1,
{$endif}

View File

@ -28,7 +28,7 @@ URLCON.PAS are covered by separate copyright notices located in those modules.
{$i htmlcons.inc}
unit Htmlview;
unit htmlview;
interface
@ -43,7 +43,7 @@ uses
{$IFNDEF LCL}
vwPrint, MetafilePrinter, mmSystem,
{$ENDIF}
HTMLUn2, Forms, Dialogs, ExtCtrls, ReadHTML, HTMLSubs, StyleUn, Printers, Menus,
htmlun2, Forms, Dialogs, ExtCtrls, ReadHTML, HTMLSubs, StyleUn, Printers, Menus,
GDIPL2A;
const