summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/gfx/eventtest/eventtest.lpi8
-rw-r--r--examples/gfx/eventtest/eventtest.pas9
-rw-r--r--prototypes/newmultihandle/gui_edit.inc4
3 files changed, 13 insertions, 8 deletions
diff --git a/examples/gfx/eventtest/eventtest.lpi b/examples/gfx/eventtest/eventtest.lpi
index 20cb4496..cef9a64b 100644
--- a/examples/gfx/eventtest/eventtest.lpi
+++ b/examples/gfx/eventtest/eventtest.lpi
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
- <PathDelim Value="/"/>
+ <PathDelim Value="\"/>
<Version Value="5"/>
<General>
<Flags>
@@ -9,18 +9,19 @@
</Flags>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
- <IconPath Value="./"/>
+ <IconPath Value=".\"/>
<TargetFileExt Value=""/>
</General>
<PublishOptions>
<Version Value="2"/>
+ <DestinationDirectory Value="$(TestDir)\publishedproject\"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
<ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
</PublishOptions>
<RunParams>
<local>
<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>
</RunParams>
<RequiredPackages Count="1">
@@ -39,6 +40,7 @@
</ProjectOptions>
<CompilerOptions>
<Version Value="5"/>
+ <PathDelim Value="\"/>
<CodeGeneration>
<Generate Value="Faster"/>
</CodeGeneration>
diff --git a/examples/gfx/eventtest/eventtest.pas b/examples/gfx/eventtest/eventtest.pas
index 8a19ef7d..8e784cb1 100644
--- a/examples/gfx/eventtest/eventtest.pas
+++ b/examples/gfx/eventtest/eventtest.pas
@@ -39,7 +39,7 @@ type
procedure MouseReleased(Sender: TObject; AButton: TMouseButton; AShift: TShiftState; const AMousePos: TPoint);
procedure MouseMove(Sender: TObject; AShift: TShiftState; const AMousePos: TPoint);
procedure MouseWheel(Sender: TObject; AShift: TShiftState; AWheelDelta: Single; const AMousePos: TPoint);
- procedure Paint(Sender: TObject; const ARect: TRect);
+ procedure Paint(Sender: TObject);
procedure Move(Sender: TObject);
procedure Resize(Sender: TObject);
private
@@ -209,14 +209,13 @@ begin
end;
-procedure TMainWindow.Paint(Sender: TObject; const ARect: TRect);
+procedure TMainWindow.Paint(Sender: TObject);
begin
- writeln(Format('Paint event rect(%d, %d, %d, %d)', [ARect.Left, ARect.Top,
- ARect.Right, ARect.Bottom]));
+ writeln('Paint event rect');
with Canvas do
begin
SetColor(colWhite);
- FillRect(ARect);
+ FillRect(Bounds(0, 0, Width, Height));
SetColor(colBlack);
TextOut(Point(0, 0), 'Event test');
diff --git a/prototypes/newmultihandle/gui_edit.inc b/prototypes/newmultihandle/gui_edit.inc
index 3e3deb56..7c1296c8 100644
--- a/prototypes/newmultihandle/gui_edit.inc
+++ b/prototypes/newmultihandle/gui_edit.inc
@@ -59,11 +59,15 @@ end;
procedure TFEdit.EvKeyPressed(AKey: Word);
begin
+ WriteLn('KeyPressed');
+
inherited EvKeyPressed(AKey);
end;
procedure TFEdit.EvKeyReleased(AKey: Word);
begin
+ WriteLn('KeyReleased');
+
inherited EvKeyReleased(AKey);
end;