summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/gfx/eventtest/eventtest.lpi6
-rw-r--r--examples/gfx/eventtest/eventtest.pas6
-rw-r--r--examples/gfx/helloworld/helloworld.lpi5
-rw-r--r--examples/gfx/helloworld/helloworld.pas11
-rw-r--r--examples/gfx/imgtest/imgtest.lpi5
-rw-r--r--examples/gfx/imgtest/imgtest.pas21
-rw-r--r--examples/img/masktest/masktest.pas17
7 files changed, 29 insertions, 42 deletions
diff --git a/examples/gfx/eventtest/eventtest.lpi b/examples/gfx/eventtest/eventtest.lpi
index 3969cc89..ee24b099 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>
@@ -14,13 +14,14 @@
</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 d870773d..aaf3e5dc 100644
--- a/examples/gfx/eventtest/eventtest.pas
+++ b/examples/gfx/eventtest/eventtest.pas
@@ -241,11 +241,11 @@ var
MainWindow: TMainWindow;
begin
- gApplication.Initialize;
+ GFApplication.Initialize;
MainWindow := TMainWindow.Create;
- gApplication.AddWindow(MainWindow);
+ GFApplication.AddWindow(MainWindow);
MainWindow.Show;
- gApplication.Run;
+ GFApplication.Run;
end.
diff --git a/examples/gfx/helloworld/helloworld.lpi b/examples/gfx/helloworld/helloworld.lpi
index 66ec049a..ae62c3cf 100644
--- a/examples/gfx/helloworld/helloworld.lpi
+++ b/examples/gfx/helloworld/helloworld.lpi
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
- <PathDelim Value="/"/>
+ <PathDelim Value="\"/>
<Version Value="5"/>
<General>
<Flags>
@@ -20,7 +20,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">
@@ -38,6 +38,7 @@
</ProjectOptions>
<CompilerOptions>
<Version Value="5"/>
+ <PathDelim Value="\"/>
<CodeGeneration>
<Generate Value="Faster"/>
</CodeGeneration>
diff --git a/examples/gfx/helloworld/helloworld.pas b/examples/gfx/helloworld/helloworld.pas
index fa7d93ce..50504a95 100644
--- a/examples/gfx/helloworld/helloworld.pas
+++ b/examples/gfx/helloworld/helloworld.pas
@@ -90,15 +90,10 @@ end;
var
MainWindow: TMainWindow;
begin
- gApplication.Initialize;
-
+ GFApplication.Initialize;
MainWindow := TMainWindow.Create;
-
- gApplication.AddWindow(MainWindow);
-
+ GFApplication.AddWindow(MainWindow);
MainWindow.Show;
-
- gApplication.Run;
+ GFApplication.Run;
end.
-
diff --git a/examples/gfx/imgtest/imgtest.lpi b/examples/gfx/imgtest/imgtest.lpi
index c507609d..fefabc63 100644
--- a/examples/gfx/imgtest/imgtest.lpi
+++ b/examples/gfx/imgtest/imgtest.lpi
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
- <PathDelim Value="/"/>
+ <PathDelim Value="\"/>
<Version Value="5"/>
<General>
<Flags>
@@ -20,7 +20,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">
@@ -39,6 +39,7 @@
</ProjectOptions>
<CompilerOptions>
<Version Value="5"/>
+ <PathDelim Value="\"/>
<CodeGeneration>
<Generate Value="Faster"/>
</CodeGeneration>
diff --git a/examples/gfx/imgtest/imgtest.pas b/examples/gfx/imgtest/imgtest.pas
index 98e9cecb..33fad0fb 100644
--- a/examples/gfx/imgtest/imgtest.pas
+++ b/examples/gfx/imgtest/imgtest.pas
@@ -3,7 +3,7 @@
Image Test example
- Copyright (C) 2000 - 2006 See the file AUTHORS, included in this
+ Copyright (C) 2000 - 2006 See the file AUTHORS.txt, included in this
distribution, for details of the copyright.
See the file COPYING.modifiedLGPL, included in this distribution,
@@ -25,7 +25,7 @@ type
TMainWindow = class(TFWindow)
procedure Paint(Sender: TObject; const Rect: TRect);
private
- Image: TFImage;
+ Bitmap: TFBitmap;
public
constructor Create;
destructor Destroy; override;
@@ -45,17 +45,18 @@ begin
SetClientSize(Size(256, 256));
SetMinMaxClientSize(Size(256, 256), Size(256, 256));
- Image := TFImage.Create(256, 256, PixelFormatRGB32);
- Image.Lock(Data, Stride);
+ Bitmap := TFBitmap.Create(256, 256, PixelFormatRGB32);
+ Bitmap.Lock(Data, Stride);
for j := 0 to 255 do
for i := 0 to 255 do
PLongWord(Data)[j * 256 + i] := (i shl 16) or (j shl 8);
- Image.Unlock;
+ Bitmap.Unlock;
end;
destructor TMainWindow.Destroy;
begin
- Image.Free;
+ Bitmap.Free;
+
inherited Destroy;
end;
@@ -69,7 +70,7 @@ begin
r.Right := Width;
r.Bottom := Height;
Canvas.FillRect(r);
- Canvas.DrawImage(Image, Point(0, 0));
+ Canvas.DrawImage(Bitmap, Point(0, 0));
end;
@@ -77,11 +78,11 @@ var
MainWindow: TMainWindow;
begin
- gApplication.Initialize;
+ GFApplication.Initialize;
MainWindow := TMainWindow.Create;
- gApplication.AddWindow(MainWindow);
+ GFApplication.AddWindow(MainWindow);
MainWindow.Show;
- gApplication.Run;
+ GFApplication.Run;
end.
diff --git a/examples/img/masktest/masktest.pas b/examples/img/masktest/masktest.pas
index 2539bf07..79b619ef 100644
--- a/examples/img/masktest/masktest.pas
+++ b/examples/img/masktest/masktest.pas
@@ -18,7 +18,7 @@
program MaskTest;
-uses Classes, GFXBase, GFXImpl, fpImg, BMPReader;
+uses Classes, GFXBase, fpGFX, fpImg, BMPReader;
type
TMainWindow = class
@@ -127,7 +127,7 @@ var
Display: TDefDisplay;
MainWindow: TMainWindow;
begin
-WriteLn('Version: ' + {$I %date%} + ' ' + {$I %time%});
+ WriteLn('Version: ' + {$I %date%} + ' ' + {$I %time%});
Display := TDefDisplay.Create;
MainWindow := TMainWindow.Create(Display);
Display.Run;
@@ -135,16 +135,3 @@ WriteLn('Version: ' + {$I %date%} + ' ' + {$I %time%});
Display.Free;
end.
-
-{
- $Log: masktest.pp,v $
- Revision 1.3 2001/02/14 23:08:59 sg
- * Adapted to changes in fpGFX interface
-
- Revision 1.2 2001/02/09 20:49:03 sg
- * Adapted to recent improvements in fpGFX interfaces
-
- Revision 1.1 2001/01/11 23:21:53 sg
- *** empty log message ***
-
-}