FIX: Compilation with GTK2 and QT.

This commit is contained in:
cobines 2013-08-17 19:16:10 +00:00
commit 571077f6bf
4 changed files with 16 additions and 6 deletions

View file

@ -31,9 +31,6 @@
}
{$MACRO ON}
{$if lcl_fullversion > 1000000}
{$define TGtk2DeviceContext:=TGtkDeviceContext}
{$endif}
{$define HAS_GETBKCOLOR}
{$define HAS_GETTEXTEXTENTEXPOINT}

View file

@ -248,6 +248,19 @@ Index: VirtualTrees.pas
if NewOffset <> FEffectiveOffsetX then
begin
if UseRightToLeftAlignment then
Index: include/intf/qt/vtgraphicsi.inc
===================================================================
--- include/intf/qt/vtgraphicsi.inc (revision 2731)
+++ include/intf/qt/vtgraphicsi.inc (working copy)
@@ -284,7 +284,7 @@
// Load MM4 with 128 to allow for saturated biasing.
MOV EAX, 128
- DB $0F, $6E, AlphaBlendLineConstant$E0 /// MOVD MM4, EAX
+ DB $0F, $6E, $E0 /// MOVD MM4, EAX
DB $0F, $61, $E4 /// PUNPCKLWD MM4, MM4
DB $0F, $62, $E4 /// PUNPCKLDQ MM4, MM4
Index: units/carbon/fakemmsystem.pas
===================================================================
--- units/carbon/fakemmsystem.pas (revision 2731)

View file

@ -284,7 +284,7 @@ asm
// Load MM4 with 128 to allow for saturated biasing.
MOV EAX, 128
DB $0F, $6E, AlphaBlendLineConstant$E0 /// MOVD MM4, EAX
DB $0F, $6E, $E0 /// MOVD MM4, EAX
DB $0F, $61, $E4 /// PUNPCKLWD MM4, MM4
DB $0F, $62, $E4 /// PUNPCKLDQ MM4, MM4

View file

@ -1490,8 +1490,8 @@ begin
VK_UP, VK_DOWN:
begin
Node := FocusedNode;
if ((Node = GetLastNoInit) and (Key = VK_DOWN))
or ((Node = GetFirstNoInit) and (Key = VK_UP)) then
if ((Node = GetLastNoInit) and (SavedKey = VK_DOWN))
or ((Node = GetFirstNoInit) and (SavedKey = VK_UP)) then
Message.CharCode := 0;
end;
{$ENDIF}