pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

jvcllaz: Fix Linux issues (CommCtrl)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5448 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-12-07 17:41:09 +00:00
parent 36baccb321
commit 46ff69fe2d
5 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemo.lpi
View File

@ -1,17 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="10"/> <Version Value="9"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<Flags> <Flags>
<LRSInOutputDirectory Value="False"/> <LRSInOutputDirectory Value="False"/>
</Flags> </Flags>
<MainUnit Value="0"/> <MainUnit Value="0"/>
<XPManifest>
<TextName Value="CompanyName.ProductName.AppName"/>
<TextDesc Value="Your application description."/>
</XPManifest>
</General> </General>
<BuildModes Count="1"> <BuildModes Count="1">
<Item1 Name="default" Default="True"/> <Item1 Name="default" Default="True"/>
@ -25,7 +21,7 @@
<RunParams> <RunParams>
<local> <local>
<FormatVersion Value="1"/> <FormatVersion Value="1"/>
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
</local> </local>
</RunParams> </RunParams>
<RequiredPackages Count="2"> <RequiredPackages Count="2">
@ -51,6 +47,7 @@
<ComponentName Value="JvNavPaneDemoMainFrm"/> <ComponentName Value="JvNavPaneDemoMainFrm"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<CursorPos X="3" Y="11"/> <CursorPos X="3" Y="11"/>
<UsageCount Value="22"/> <UsageCount Value="22"/>
@ -84,7 +81,6 @@
</Unit5> </Unit5>
<Unit6> <Unit6>
<Filename Value="..\..\run\JvPageComps\JvNavigationPane.pas"/> <Filename Value="..\..\run\JvPageComps\JvNavigationPane.pas"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="2"/> <EditorIndex Value="2"/>
<TopLine Value="31"/> <TopLine Value="31"/>
<CursorPos X="61" Y="50"/> <CursorPos X="61" Y="50"/>

2
components/jvcllaz/examples/JvNavigationPane/JvNavPaneDemoMainForm.pas
View File

@ -65,8 +65,6 @@ var
JvNavPaneDemoMainFrm: TJvNavPaneDemoMainFrm; JvNavPaneDemoMainFrm: TJvNavPaneDemoMainFrm;
implementation implementation
uses
CommCtrl;
procedure TJvNavPaneDemoMainFrm.FormCreate(Sender: TObject); procedure TJvNavPaneDemoMainFrm.FormCreate(Sender: TObject);
var var

2
components/jvcllaz/packages/JvPageCompsR.lpk
View File

@ -8,7 +8,7 @@
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<SearchPaths> <SearchPaths>
<OtherUnitFiles Value="..\run\JvPageComps;..\run\JvStdCtrls"/> <OtherUnitFiles Value="..\run\JvPageComps"/>
<UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\run\JvPageComps"/> <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\run\JvPageComps"/>
</SearchPaths> </SearchPaths>
</CompilerOptions> </CompilerOptions>

3
components/jvcllaz/run/JvCore/JvConsts.pas
View File

@ -207,6 +207,9 @@ const
DT_PATH_ELLIPSIS = $4000; DT_PATH_ELLIPSIS = $4000;
COLORONCOLOR = 3;
STRETCH_DELETESCANS = COLORONCOLOR;
const const
KeyboardShiftStates = [ssShift, ssAlt, ssCtrl]; KeyboardShiftStates = [ssShift, ssAlt, ssCtrl];

6
components/jvcllaz/run/JvCore/JvJVCLUtils.pas
View File

@ -855,11 +855,11 @@ function ReplaceImageListReference(This: TComponent; NewReference: TCustomImageL
implementation implementation
uses uses
sysutils, LCLIntf, sysutils, LCLIntf, GraphType, Math, Forms,
{$IFDEF MSWINDOWS} {$IFDEF MSWINDOWS}
CommCtrl, CommCtrl,
{$ENDIF} {$ENDIF}
math, JvConsts, JvJCLUtils; JvConsts, JvJCLUtils;
(******************** (********************
SysConst, SysConst,
Consts, Consts,
@ -2057,7 +2057,7 @@ begin
{$IFDEF MSWINDOWS} {$IFDEF MSWINDOWS}
ImageList_Draw(Images.Handle, Index, Handle, 0, 0, ILD_MASK); ImageList_Draw(Images.Handle, Index, Handle, 0, 0, ILD_MASK);
{$ELSE} {$ELSE}
ImageList_Draw ???? Images.GetBitmap(Index, Bmp, gdeDisabled); // to do: test this
{$ENDIF} {$ENDIF}
end; end;
Bmp.Monochrome := True; Bmp.Monochrome := True;