diff options
| -rw-r--r-- | examples/corelib/eventtest/eventtest.lpi | 9 | ||||
| -rw-r--r-- | examples/corelib/eventtest/eventtest.lpr | 17 | ||||
| -rw-r--r-- | examples/gui/bevel/beveltest.lpi | 9 | ||||
| -rw-r--r-- | examples/gui/bevel/beveltest.lpr | 20 | ||||
| -rw-r--r-- | src/corelib/gdi/gfx_gdi.pas | 4 |
5 files changed, 29 insertions, 30 deletions
diff --git a/examples/corelib/eventtest/eventtest.lpi b/examples/corelib/eventtest/eventtest.lpi index e2c02519..e0cd91bf 100644 --- a/examples/corelib/eventtest/eventtest.lpi +++ b/examples/corelib/eventtest/eventtest.lpi @@ -1,15 +1,15 @@ <?xml version="1.0"?> <CONFIG> <ProjectOptions> - <PathDelim Value="/"/> - <Version Value="6"/> + <PathDelim Value="\"/> + <Version Value="5"/> <General> <Flags> <SaveOnlyProjectUnits Value="True"/> </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <IconPath Value="./"/> + <IconPath Value=".\"/> <TargetFileExt Value=""/> </General> <VersionInfo> @@ -23,7 +23,7 @@ <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"> @@ -42,6 +42,7 @@ </ProjectOptions> <CompilerOptions> <Version Value="5"/> + <PathDelim Value="\"/> <CodeGeneration> <Optimizations> <OptimizationLevel Value="0"/> diff --git a/examples/corelib/eventtest/eventtest.lpr b/examples/corelib/eventtest/eventtest.lpr index 3f01bb21..bdd69c68 100644 --- a/examples/corelib/eventtest/eventtest.lpr +++ b/examples/corelib/eventtest/eventtest.lpr @@ -100,7 +100,7 @@ end; procedure TMainForm.MsgDeActivate(var msg: TfpgMessageRec); begin - Writeln('Window is Deactivate message'); + Writeln('Window Deactivate message'); end; procedure TMainForm.MsgClose(var msg: TfpgMessageRec); @@ -127,19 +127,16 @@ end; procedure TMainForm.MsgResize(var msg: TfpgMessageRec); begin - Writeln('Resize'); + Writeln('Resize message'); FWidth := msg.Params.rect.Width; FHeight := msg.Params.rect.Height; - - WriteLn('Window has been resized. New width: ', - Width, ' x ', Height); -// '; new client width: ', ClientWidth, ' x ', ClientHeight); - + WriteLn(' Window has been resized. New size: ', Width, ' x ', Height); end; procedure TMainForm.MsgMove(var msg: TfpgMessageRec); begin - WriteLn('Window has been moved to ', msg.Params.rect.Left, '/', msg.Params.rect.Top); + Writeln('Move message'); + WriteLn(' Window has been moved to (', msg.Params.rect.Left, ',', msg.Params.rect.Top, ')'); end; procedure TMainForm.MsgKeyChar(var msg: TfpgMessageRec); @@ -192,7 +189,7 @@ end; procedure TMainForm.MsgDoubleClick(var msg: TfpgMessageRec); begin - Writeln('Mouse doubleclick'); + Writeln('Mouse doubleclick message'); end; procedure TMainForm.MsgMouseEnter(var msg: TfpgMessageRec); @@ -207,7 +204,7 @@ end; procedure TMainForm.MsgScroll(var msg: TfpgMessageRec); var - delta: smallint; + delta: Integer; begin delta := msg.Params.mouse.delta; Writeln('Mouse scroll delta=' + IntToStr(delta) + ' button=' + IntToStr(msg.Params.mouse.Buttons)); diff --git a/examples/gui/bevel/beveltest.lpi b/examples/gui/bevel/beveltest.lpi index 28d21960..a0654cb0 100644 --- a/examples/gui/bevel/beveltest.lpi +++ b/examples/gui/bevel/beveltest.lpi @@ -1,15 +1,15 @@ <?xml version="1.0"?> <CONFIG> <ProjectOptions> - <PathDelim Value="/"/> - <Version Value="6"/> + <PathDelim Value="\"/> + <Version Value="5"/> <General> <Flags> <SaveOnlyProjectUnits Value="True"/> </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <IconPath Value="./"/> + <IconPath Value=".\"/> <TargetFileExt Value=""/> </General> <VersionInfo> @@ -23,7 +23,7 @@ <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"> @@ -42,6 +42,7 @@ </ProjectOptions> <CompilerOptions> <Version Value="5"/> + <PathDelim Value="\"/> <CodeGeneration> <Generate Value="Faster"/> </CodeGeneration> diff --git a/examples/gui/bevel/beveltest.lpr b/examples/gui/bevel/beveltest.lpr index 287788ea..3b7deb9d 100644 --- a/examples/gui/bevel/beveltest.lpr +++ b/examples/gui/bevel/beveltest.lpr @@ -11,7 +11,7 @@ uses fpgfx, gui_form, gui_button, - gui_bevel, + gui_panel, gui_label; type @@ -57,19 +57,19 @@ end; procedure TMainForm.btnShapesClick(Sender: TObject); var - next: TBevelShape; + next: TPanelShape; begin - if Bevel.Shape = High(TBevelShape) then - Bevel.Shape := Low(TBevelShape) + if Bevel.Shape = High(TPanelShape) then + Bevel.Shape := Low(TPanelShape) else - Bevel.Shape := TBevelShape(Ord(Bevel.Shape) + 1); - lblShape.Text := 'Shape is ' + GetEnumName(TypeInfo(TBevelShape), Ord(Bevel.Shape)); + Bevel.Shape := TPanelShape(Ord(Bevel.Shape) + 1); + lblShape.Text := 'Shape is ' + GetEnumName(TypeInfo(TPanelShape), Ord(Bevel.Shape)); - if Bevel.Shape = High(TBevelShape) then - next := Low(TBevelShape) + if Bevel.Shape = High(TPanelShape) then + next := Low(TPanelShape) else - next := TBevelShape(Ord(Bevel.Shape) + 1); - btnShapes.Text := GetEnumName(TypeInfo(TBevelShape), Ord(next)); + next := TPanelShape(Ord(Bevel.Shape) + 1); + btnShapes.Text := GetEnumName(TypeInfo(TPanelShape), Ord(next)); end; constructor TMainForm.Create(AOwner: TComponent); diff --git a/src/corelib/gdi/gfx_gdi.pas b/src/corelib/gdi/gfx_gdi.pas index 77b4379d..67d04de1 100644 --- a/src/corelib/gdi/gfx_gdi.pas +++ b/src/corelib/gdi/gfx_gdi.pas @@ -1315,9 +1315,9 @@ begin SetCursor(hc); end; -constructor TfpgWindowImpl.Create(aowner: TComponent); +constructor TfpgWindowImpl.Create(AOwner: TComponent); begin - inherited; + inherited Create(AOwner); FWinHandle := 0; end; |