mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-09 23:08:05 +02:00
TBitmap: fixed using destinatin CopyMode from Giuliano Colla
git-svn-id: trunk@9786 -
This commit is contained in:
mattias
parent
352eaa11ed
commit
63b0a6e0d6
157
ide/lazbuild.lpi
157
ide/lazbuild.lpi
@ -7,7 +7,7 @@
|
||||
<MainUnit Value="0"/>
|
||||
<IconPath Value="./"/>
|
||||
<TargetFileExt Value=""/>
|
||||
<ActiveEditorIndexAtStart Value="1"/>
|
||||
<ActiveEditorIndexAtStart Value="2"/>
|
||||
</General>
|
||||
<PublishOptions>
|
||||
<Version Value="2"/>
|
||||
@ -29,24 +29,24 @@
|
||||
<PackageName Value="IDEIntf"/>
|
||||
</Item2>
|
||||
</RequiredPackages>
|
||||
<Units Count="23">
|
||||
<Units Count="24">
|
||||
<Unit0>
|
||||
<Filename Value="lazbuild.lpr"/>
|
||||
<IsPartOfProject Value="True"/>
|
||||
<UnitName Value="lazbuild"/>
|
||||
<CursorPos X="52" Y="30"/>
|
||||
<TopLine Value="1"/>
|
||||
<CursorPos X="18" Y="37"/>
|
||||
<TopLine Value="11"/>
|
||||
<EditorIndex Value="0"/>
|
||||
<UsageCount Value="24"/>
|
||||
<UsageCount Value="39"/>
|
||||
<Loaded Value="True"/>
|
||||
</Unit0>
|
||||
<Unit1>
|
||||
<Filename Value="main.pp"/>
|
||||
<UnitName Value="Main"/>
|
||||
<CursorPos X="14" Y="1593"/>
|
||||
<TopLine Value="1590"/>
|
||||
<CursorPos X="29" Y="3655"/>
|
||||
<TopLine Value="3628"/>
|
||||
<EditorIndex Value="2"/>
|
||||
<UsageCount Value="12"/>
|
||||
<UsageCount Value="19"/>
|
||||
<Bookmarks Count="1">
|
||||
<Item0 X="8" Y="923" ID="0"/>
|
||||
</Bookmarks>
|
||||
@ -57,22 +57,24 @@
|
||||
<UnitName Value="CustApp"/>
|
||||
<CursorPos X="107" Y="60"/>
|
||||
<TopLine Value="38"/>
|
||||
<UsageCount Value="10"/>
|
||||
<UsageCount Value="9"/>
|
||||
</Unit2>
|
||||
<Unit3>
|
||||
<Filename Value="idetranslations.pas"/>
|
||||
<UnitName Value="IDETranslations"/>
|
||||
<CursorPos X="11" Y="67"/>
|
||||
<TopLine Value="42"/>
|
||||
<UsageCount Value="10"/>
|
||||
<CursorPos X="3" Y="163"/>
|
||||
<TopLine Value="136"/>
|
||||
<EditorIndex Value="3"/>
|
||||
<UsageCount Value="17"/>
|
||||
<Loaded Value="True"/>
|
||||
</Unit3>
|
||||
<Unit4>
|
||||
<Filename Value="lazarusidestrconsts.pas"/>
|
||||
<UnitName Value="LazarusIDEStrConsts"/>
|
||||
<CursorPos X="15" Y="265"/>
|
||||
<CursorPos X="24" Y="255"/>
|
||||
<TopLine Value="241"/>
|
||||
<EditorIndex Value="1"/>
|
||||
<UsageCount Value="11"/>
|
||||
<UsageCount Value="19"/>
|
||||
<Loaded Value="True"/>
|
||||
</Unit4>
|
||||
<Unit5>
|
||||
@ -80,56 +82,56 @@
|
||||
<UnitName Value="IDEProtocol"/>
|
||||
<CursorPos X="1" Y="29"/>
|
||||
<TopLine Value="2"/>
|
||||
<UsageCount Value="10"/>
|
||||
<UsageCount Value="9"/>
|
||||
</Unit5>
|
||||
<Unit6>
|
||||
<Filename Value="ideoptiondefs.pas"/>
|
||||
<UnitName Value="IDEOptionDefs"/>
|
||||
<CursorPos X="1" Y="319"/>
|
||||
<TopLine Value="298"/>
|
||||
<UsageCount Value="10"/>
|
||||
<UsageCount Value="9"/>
|
||||
</Unit6>
|
||||
<Unit7>
|
||||
<Filename Value="idedefs.pas"/>
|
||||
<UnitName Value="IDEDefs"/>
|
||||
<CursorPos X="1" Y="1"/>
|
||||
<TopLine Value="1"/>
|
||||
<UsageCount Value="10"/>
|
||||
<UsageCount Value="9"/>
|
||||
</Unit7>
|
||||
<Unit8>
|
||||
<Filename Value="lazconf.pp"/>
|
||||
<UnitName Value="LazConf"/>
|
||||
<CursorPos X="13" Y="81"/>
|
||||
<TopLine Value="56"/>
|
||||
<UsageCount Value="10"/>
|
||||
<UsageCount Value="9"/>
|
||||
</Unit8>
|
||||
<Unit9>
|
||||
<Filename Value="include/unix/lazbaseconf.inc"/>
|
||||
<CursorPos X="3" Y="90"/>
|
||||
<TopLine Value="84"/>
|
||||
<UsageCount Value="10"/>
|
||||
<UsageCount Value="9"/>
|
||||
</Unit9>
|
||||
<Unit10>
|
||||
<Filename Value="environmentopts.pp"/>
|
||||
<UnitName Value="EnvironmentOpts"/>
|
||||
<CursorPos X="14" Y="21"/>
|
||||
<TopLine Value="1"/>
|
||||
<UsageCount Value="10"/>
|
||||
<UsageCount Value="9"/>
|
||||
</Unit10>
|
||||
<Unit11>
|
||||
<Filename Value="initialsetupdlgs.pas"/>
|
||||
<UnitName Value="InitialSetupDlgs"/>
|
||||
<CursorPos X="3" Y="64"/>
|
||||
<TopLine Value="54"/>
|
||||
<UsageCount Value="10"/>
|
||||
<UsageCount Value="9"/>
|
||||
</Unit11>
|
||||
<Unit12>
|
||||
<Filename Value="mainbase.pas"/>
|
||||
<UnitName Value="MainBase"/>
|
||||
<CursorPos X="1" Y="143"/>
|
||||
<TopLine Value="143"/>
|
||||
<EditorIndex Value="3"/>
|
||||
<UsageCount Value="12"/>
|
||||
<EditorIndex Value="5"/>
|
||||
<UsageCount Value="19"/>
|
||||
<Loaded Value="True"/>
|
||||
</Unit12>
|
||||
<Unit13>
|
||||
@ -137,22 +139,22 @@
|
||||
<UnitName Value="MiscOptions"/>
|
||||
<CursorPos X="3" Y="88"/>
|
||||
<TopLine Value="53"/>
|
||||
<UsageCount Value="10"/>
|
||||
<UsageCount Value="9"/>
|
||||
</Unit13>
|
||||
<Unit14>
|
||||
<Filename Value="codetoolsoptions.pas"/>
|
||||
<UnitName Value="CodeToolsOptions"/>
|
||||
<CursorPos X="3" Y="94"/>
|
||||
<TopLine Value="44"/>
|
||||
<UsageCount Value="10"/>
|
||||
<UsageCount Value="9"/>
|
||||
</Unit14>
|
||||
<Unit15>
|
||||
<Filename Value="mainintf.pas"/>
|
||||
<UnitName Value="MainIntf"/>
|
||||
<CursorPos X="1" Y="171"/>
|
||||
<TopLine Value="139"/>
|
||||
<EditorIndex Value="6"/>
|
||||
<UsageCount Value="12"/>
|
||||
<EditorIndex Value="8"/>
|
||||
<UsageCount Value="19"/>
|
||||
<Loaded Value="True"/>
|
||||
</Unit15>
|
||||
<Unit16>
|
||||
@ -160,22 +162,22 @@
|
||||
<UnitName Value="MacroIntf"/>
|
||||
<CursorPos X="3" Y="29"/>
|
||||
<TopLine Value="4"/>
|
||||
<UsageCount Value="10"/>
|
||||
<UsageCount Value="9"/>
|
||||
</Unit16>
|
||||
<Unit17>
|
||||
<Filename Value="exttooleditdlg.pas"/>
|
||||
<UnitName Value="ExtToolEditDlg"/>
|
||||
<CursorPos X="22" Y="34"/>
|
||||
<TopLine Value="10"/>
|
||||
<UsageCount Value="10"/>
|
||||
<UsageCount Value="9"/>
|
||||
</Unit17>
|
||||
<Unit18>
|
||||
<Filename Value="dialogprocs.pas"/>
|
||||
<UnitName Value="DialogProcs"/>
|
||||
<CursorPos X="29" Y="68"/>
|
||||
<TopLine Value="44"/>
|
||||
<EditorIndex Value="5"/>
|
||||
<UsageCount Value="12"/>
|
||||
<EditorIndex Value="7"/>
|
||||
<UsageCount Value="19"/>
|
||||
<Loaded Value="True"/>
|
||||
</Unit18>
|
||||
<Unit19>
|
||||
@ -183,8 +185,8 @@
|
||||
<UnitName Value="IDEProcs"/>
|
||||
<CursorPos X="11" Y="95"/>
|
||||
<TopLine Value="70"/>
|
||||
<EditorIndex Value="4"/>
|
||||
<UsageCount Value="12"/>
|
||||
<EditorIndex Value="6"/>
|
||||
<UsageCount Value="19"/>
|
||||
<Loaded Value="True"/>
|
||||
</Unit19>
|
||||
<Unit20>
|
||||
@ -192,8 +194,8 @@
|
||||
<UnitName Value="PkgManager"/>
|
||||
<CursorPos X="9" Y="136"/>
|
||||
<TopLine Value="125"/>
|
||||
<EditorIndex Value="7"/>
|
||||
<UsageCount Value="11"/>
|
||||
<EditorIndex Value="9"/>
|
||||
<UsageCount Value="19"/>
|
||||
<Loaded Value="True"/>
|
||||
</Unit20>
|
||||
<Unit21>
|
||||
@ -201,8 +203,8 @@
|
||||
<UnitName Value="BasePkgManager"/>
|
||||
<CursorPos X="19" Y="109"/>
|
||||
<TopLine Value="70"/>
|
||||
<EditorIndex Value="8"/>
|
||||
<UsageCount Value="11"/>
|
||||
<EditorIndex Value="10"/>
|
||||
<UsageCount Value="19"/>
|
||||
<Loaded Value="True"/>
|
||||
</Unit21>
|
||||
<Unit22>
|
||||
@ -210,80 +212,45 @@
|
||||
<UnitName Value="PackageIntf"/>
|
||||
<CursorPos X="3" Y="65"/>
|
||||
<TopLine Value="34"/>
|
||||
<EditorIndex Value="9"/>
|
||||
<UsageCount Value="11"/>
|
||||
<EditorIndex Value="11"/>
|
||||
<UsageCount Value="19"/>
|
||||
<Loaded Value="True"/>
|
||||
</Unit22>
|
||||
<Unit23>
|
||||
<Filename Value="../lcl/defaulttranslator.pas"/>
|
||||
<UnitName Value="DefaultTranslator"/>
|
||||
<CursorPos X="5" Y="236"/>
|
||||
<TopLine Value="202"/>
|
||||
<EditorIndex Value="4"/>
|
||||
<UsageCount Value="17"/>
|
||||
<Loaded Value="True"/>
|
||||
</Unit23>
|
||||
</Units>
|
||||
<JumpHistory Count="17" HistoryIndex="16">
|
||||
<JumpHistory Count="6" HistoryIndex="5">
|
||||
<Position1>
|
||||
<Filename Value="main.pp"/>
|
||||
<Caret Line="1593" Column="14" TopLine="1590"/>
|
||||
<Caret Line="3650" Column="12" TopLine="3628"/>
|
||||
</Position1>
|
||||
<Position2>
|
||||
<Filename Value="lazbuild.lpr"/>
|
||||
<Caret Line="110" Column="3" TopLine="96"/>
|
||||
<Filename Value="../lcl/defaulttranslator.pas"/>
|
||||
<Caret Line="1" Column="1" TopLine="1"/>
|
||||
</Position2>
|
||||
<Position3>
|
||||
<Filename Value="lazbuild.lpr"/>
|
||||
<Caret Line="52" Column="15" TopLine="25"/>
|
||||
<Filename Value="main.pp"/>
|
||||
<Caret Line="3653" Column="33" TopLine="3624"/>
|
||||
</Position3>
|
||||
<Position4>
|
||||
<Filename Value="mainbase.pas"/>
|
||||
<Caret Line="196" Column="26" TopLine="156"/>
|
||||
<Filename Value="main.pp"/>
|
||||
<Caret Line="1027" Column="5" TopLine="1002"/>
|
||||
</Position4>
|
||||
<Position5>
|
||||
<Filename Value="dialogprocs.pas"/>
|
||||
<Caret Line="261" Column="1" TopLine="205"/>
|
||||
<Filename Value="idetranslations.pas"/>
|
||||
<Caret Line="67" Column="11" TopLine="42"/>
|
||||
</Position5>
|
||||
<Position6>
|
||||
<Filename Value="mainbase.pas"/>
|
||||
<Caret Line="1011" Column="7" TopLine="976"/>
|
||||
<Filename Value="main.pp"/>
|
||||
<Caret Line="3653" Column="9" TopLine="3628"/>
|
||||
</Position6>
|
||||
<Position7>
|
||||
<Filename Value="dialogprocs.pas"/>
|
||||
<Caret Line="265" Column="10" TopLine="244"/>
|
||||
</Position7>
|
||||
<Position8>
|
||||
<Filename Value="mainbase.pas"/>
|
||||
<Caret Line="1322" Column="3" TopLine="1281"/>
|
||||
</Position8>
|
||||
<Position9>
|
||||
<Filename Value="../packager/pkgmanager.pas"/>
|
||||
<Caret Line="1" Column="1" TopLine="1"/>
|
||||
</Position9>
|
||||
<Position10>
|
||||
<Filename Value="../packager/pkgmanager.pas"/>
|
||||
<Caret Line="1186" Column="23" TopLine="1159"/>
|
||||
</Position10>
|
||||
<Position11>
|
||||
<Filename Value="../packager/pkgmanager.pas"/>
|
||||
<Caret Line="945" Column="1" TopLine="945"/>
|
||||
</Position11>
|
||||
<Position12>
|
||||
<Filename Value="../packager/pkgmanager.pas"/>
|
||||
<Caret Line="4456" Column="1" TopLine="4406"/>
|
||||
</Position12>
|
||||
<Position13>
|
||||
<Filename Value="../packager/pkgmanager.pas"/>
|
||||
<Caret Line="78" Column="27" TopLine="36"/>
|
||||
</Position13>
|
||||
<Position14>
|
||||
<Filename Value="lazbuild.lpr"/>
|
||||
<Caret Line="30" Column="52" TopLine="1"/>
|
||||
</Position14>
|
||||
<Position15>
|
||||
<Filename Value="lazarusidestrconsts.pas"/>
|
||||
<Caret Line="1" Column="1" TopLine="1"/>
|
||||
</Position15>
|
||||
<Position16>
|
||||
<Filename Value="lazarusidestrconsts.pas"/>
|
||||
<Caret Line="686" Column="25" TopLine="660"/>
|
||||
</Position16>
|
||||
<Position17>
|
||||
<Filename Value="lazarusidestrconsts.pas"/>
|
||||
<Caret Line="1" Column="1" TopLine="1"/>
|
||||
</Position17>
|
||||
</JumpHistory>
|
||||
</ProjectOptions>
|
||||
<CompilerOptions>
|
||||
|
||||
@ -3595,6 +3595,7 @@ var
|
||||
EnvironmentOptionsDialog: TEnvironmentOptionsDialog;
|
||||
MacroValueChanged, FPCSrcDirChanged, FPCCompilerChanged: boolean;
|
||||
OldCompilerFilename: string;
|
||||
OldLanguage: String;
|
||||
|
||||
procedure ChangeMacroValue(const MacroName, NewValue: string);
|
||||
begin
|
||||
@ -3646,7 +3647,12 @@ Begin
|
||||
// load settings from EnvironmentOptions to EnvironmentOptionsDialog
|
||||
ReadSettings(EnvironmentOptions);
|
||||
end;
|
||||
OldLanguage:=EnvironmentOptions.LanguageID;
|
||||
if EnvironmentOptionsDialog.ShowModal=mrOk then begin
|
||||
if OldLanguage<>EnvironmentOptions.LanguageID then
|
||||
TranslateResourceStrings(EnvironmentOptions.LazarusDirectory,
|
||||
EnvironmentOptions.LanguageID);
|
||||
|
||||
// invalidate cached substituted macros
|
||||
IncreaseCompilerParseStamp;
|
||||
|
||||
|
||||
@ -118,7 +118,7 @@ begin
|
||||
StretchMaskBlt(DestDC,
|
||||
DestRect.Left,DestRect.Top,
|
||||
DestRect.Right-DestRect.Left,DestRect.Bottom-DestRect.Top,
|
||||
SrcDC,0,0,Width,Height, UseMaskHandle,0,0,SRCCOPY);
|
||||
SrcDC,0,0,Width,Height, UseMaskHandle,0,0,DestCanvas.CopyMode);
|
||||
DestCanvas.Changed;
|
||||
end;
|
||||
end;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user