summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/corelib/canvastest/fpgcanvas.lpi3
-rw-r--r--examples/corelib/eventtest/eventtest.lpi10
-rw-r--r--examples/corelib/helloworld/helloworld.lpi3
-rw-r--r--examples/gui/alignment/aligntest.lpi3
-rw-r--r--examples/gui/imgtest/bitmaptest.dpr36
-rw-r--r--examples/gui/imgtest/bitmaptest.lpi15
-rw-r--r--examples/gui/modalforms/modalforms.lpi4
-rw-r--r--examples/gui/stdimages/stdimglist.lpi3
-rw-r--r--examples/gui/timertest/timertest.lpi10
-rw-r--r--prototypes/fpgui2/tests/bitmaptest.dpr67
-rw-r--r--prototypes/fpgui2/tests/bitmaptest.lpi63
-rw-r--r--prototypes/fpgui2/tests/edittest.dpr6
-rw-r--r--prototypes/fpgui2/tests/edittest.lpi3
-rw-r--r--prototypes/fpgui2/tests/themetest.lpi3
-rw-r--r--prototypes/fpgui2/tests/themetest.lpr10
-rw-r--r--src/corelib/x11/fpGFX2.pas17
-rw-r--r--src/corelib/x11/fpgfx_package.lpk (renamed from src/corelib/x11/fpGFX2.lpk)78
-rw-r--r--src/corelib/x11/fpgfx_package.pas15
-rw-r--r--src/gui/fpgui_package.lpk81
-rw-r--r--src/gui/fpgui_package.pas15
20 files changed, 180 insertions, 265 deletions
diff --git a/examples/corelib/canvastest/fpgcanvas.lpi b/examples/corelib/canvastest/fpgcanvas.lpi
index 9c070422..6ba29e31 100644
--- a/examples/corelib/canvastest/fpgcanvas.lpi
+++ b/examples/corelib/canvastest/fpgcanvas.lpi
@@ -29,7 +29,8 @@
</RunParams>
<RequiredPackages Count="1">
<Item1>
- <PackageName Value="fpGFX2"/>
+ <PackageName Value="fpgfx_package"/>
+ <MinVersion Minor="5" Valid="True"/>
</Item1>
</RequiredPackages>
<Units Count="1">
diff --git a/examples/corelib/eventtest/eventtest.lpi b/examples/corelib/eventtest/eventtest.lpi
index f09daf7e..2565f331 100644
--- a/examples/corelib/eventtest/eventtest.lpi
+++ b/examples/corelib/eventtest/eventtest.lpi
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
- <PathDelim Value="\"/>
+ <PathDelim Value="/"/>
<Version Value="5"/>
<General>
<Flags>
@@ -9,7 +9,7 @@
</Flags>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
- <IconPath Value=".\"/>
+ <IconPath Value="./"/>
<TargetFileExt Value=""/>
</General>
<VersionInfo>
@@ -23,12 +23,13 @@
<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">
<Item1>
- <PackageName Value="fpGFX2"/>
+ <PackageName Value="fpgfx_package"/>
+ <MinVersion Minor="5" Valid="True"/>
</Item1>
</RequiredPackages>
<Units Count="1">
@@ -41,7 +42,6 @@
</ProjectOptions>
<CompilerOptions>
<Version Value="5"/>
- <PathDelim Value="\"/>
<CodeGeneration>
<Optimizations>
<OptimizationLevel Value="0"/>
diff --git a/examples/corelib/helloworld/helloworld.lpi b/examples/corelib/helloworld/helloworld.lpi
index 3a9cb741..c311f8d0 100644
--- a/examples/corelib/helloworld/helloworld.lpi
+++ b/examples/corelib/helloworld/helloworld.lpi
@@ -28,7 +28,8 @@
</RunParams>
<RequiredPackages Count="1">
<Item1>
- <PackageName Value="fpGFX2"/>
+ <PackageName Value="fpgfx_package"/>
+ <MinVersion Minor="5" Valid="True"/>
</Item1>
</RequiredPackages>
<Units Count="1">
diff --git a/examples/gui/alignment/aligntest.lpi b/examples/gui/alignment/aligntest.lpi
index 5d943df0..4baa8867 100644
--- a/examples/gui/alignment/aligntest.lpi
+++ b/examples/gui/alignment/aligntest.lpi
@@ -25,7 +25,8 @@
</RunParams>
<RequiredPackages Count="1">
<Item1>
- <PackageName Value="fpGFX2"/>
+ <PackageName Value="fpgui_package"/>
+ <MinVersion Minor="5" Valid="True"/>
</Item1>
</RequiredPackages>
<Units Count="1">
diff --git a/examples/gui/imgtest/bitmaptest.dpr b/examples/gui/imgtest/bitmaptest.dpr
index 8ab86361..c8000d15 100644
--- a/examples/gui/imgtest/bitmaptest.dpr
+++ b/examples/gui/imgtest/bitmaptest.dpr
@@ -7,46 +7,40 @@ uses
SysUtils,
gfxbase,
fpgfx,
- gfx_imgfmt_bmp;
+ gfx_imgfmt_bmp,
+ gui_form;
type
- TMainForm = class(TfpgWindow)
+ TMainForm = class(TfpgForm)
private
img: TfpgImage;
- procedure MsgPaint(var msg: TfpgMessageRec); message FPGM_PAINT;
- procedure MsgClose(var msg: TfpgMessageRec); message FPGM_CLOSE;
+ protected
+ procedure HandlePaint; override;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
- procedure Show;
end;
{ TMainForm }
-procedure TMainForm.MsgPaint(var msg: TfpgMessageRec);
+procedure TMainForm.HandlePaint;
begin
- Canvas.BeginDraw;
+ Canvas.BeginDraw; // activate double buffering in time.
+ inherited HandlePaint;
Canvas.DrawImage(0, 0, img);
Canvas.EndDraw;
end;
-procedure TMainForm.MsgClose(var msg: TfpgMessageRec);
-begin
- ReleaseWindowHandle;
- Halt(0);
-end;
-
constructor TMainForm.Create(AOwner: TComponent);
var
i, j: integer;
begin
inherited Create(AOwner);
- FWidth := 256;
- FHeight := 256;
- WindowAttributes := [waScreenCenterPos];
-
+ SetPosition(100, 100, 256, 256);
+ WindowTitle := 'fpGUI Bitmap Test';
+
img := TfpgImage.Create;
img.AllocateImage(32, 256, 256);
img.UpdateImage;
@@ -62,13 +56,6 @@ begin
inherited Destroy;
end;
-procedure TMainForm.Show;
-begin
- AllocateWindowHandle;
- // We can only set the title once we have a window handle.
- SetWindowTitle('fpGUI Bitmap Test');
-end;
-
procedure MainProc;
var
@@ -80,6 +67,7 @@ begin
fpgApplication.Run;
end;
+
begin
MainProc;
end.
diff --git a/examples/gui/imgtest/bitmaptest.lpi b/examples/gui/imgtest/bitmaptest.lpi
index c8bf98e0..de1157a5 100644
--- a/examples/gui/imgtest/bitmaptest.lpi
+++ b/examples/gui/imgtest/bitmaptest.lpi
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
- <PathDelim Value="\"/>
+ <PathDelim Value="/"/>
<Version Value="5"/>
<General>
<Flags>
@@ -9,7 +9,7 @@
</Flags>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
- <IconPath Value=".\"/>
+ <IconPath Value="./"/>
<TargetFileExt Value=""/>
<Title Value="bitmaptest"/>
</General>
@@ -18,19 +18,19 @@
</VersionInfo>
<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">
<Item1>
- <PackageName Value="fpGFX2"/>
+ <PackageName Value="fpgui_package"/>
+ <MinVersion Minor="5" Valid="True"/>
</Item1>
</RequiredPackages>
<Units Count="1">
@@ -43,10 +43,9 @@
</ProjectOptions>
<CompilerOptions>
<Version Value="5"/>
- <PathDelim Value="\"/>
<SearchPaths>
- <IncludeFiles Value="..\source\"/>
- <OtherUnitFiles Value="..\source\;..\source\x11\;..\gui\"/>
+ <IncludeFiles Value="../source/"/>
+ <OtherUnitFiles Value="../source/;../source/x11/;../gui/"/>
</SearchPaths>
<CodeGeneration>
<Generate Value="Faster"/>
diff --git a/examples/gui/modalforms/modalforms.lpi b/examples/gui/modalforms/modalforms.lpi
index 2d2e9d9d..4dffc0d7 100644
--- a/examples/gui/modalforms/modalforms.lpi
+++ b/examples/gui/modalforms/modalforms.lpi
@@ -9,6 +9,7 @@
</Flags>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
+ <IconPath Value="./"/>
<TargetFileExt Value=""/>
</General>
<VersionInfo>
@@ -28,7 +29,8 @@
</RunParams>
<RequiredPackages Count="1">
<Item1>
- <PackageName Value="fpGFX2"/>
+ <PackageName Value="fpgui_package"/>
+ <MinVersion Minor="5" Valid="True"/>
</Item1>
</RequiredPackages>
<Units Count="1">
diff --git a/examples/gui/stdimages/stdimglist.lpi b/examples/gui/stdimages/stdimglist.lpi
index f43952b3..1d6f96bb 100644
--- a/examples/gui/stdimages/stdimglist.lpi
+++ b/examples/gui/stdimages/stdimglist.lpi
@@ -28,7 +28,8 @@
</RunParams>
<RequiredPackages Count="1">
<Item1>
- <PackageName Value="fpGFX2"/>
+ <PackageName Value="fpgui_package"/>
+ <MinVersion Minor="5" Valid="True"/>
</Item1>
</RequiredPackages>
<Units Count="1">
diff --git a/examples/gui/timertest/timertest.lpi b/examples/gui/timertest/timertest.lpi
index 0dfae648..32287328 100644
--- a/examples/gui/timertest/timertest.lpi
+++ b/examples/gui/timertest/timertest.lpi
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
- <PathDelim Value="\"/>
+ <PathDelim Value="/"/>
<Version Value="5"/>
<General>
<Flags>
@@ -9,7 +9,7 @@
</Flags>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
- <IconPath Value=".\"/>
+ <IconPath Value="./"/>
<TargetFileExt Value=""/>
</General>
<VersionInfo>
@@ -23,12 +23,13 @@
<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">
<Item1>
- <PackageName Value="fpGFX2"/>
+ <PackageName Value="fpgui_package"/>
+ <MinVersion Minor="5" Valid="True"/>
</Item1>
</RequiredPackages>
<Units Count="1">
@@ -41,7 +42,6 @@
</ProjectOptions>
<CompilerOptions>
<Version Value="5"/>
- <PathDelim Value="\"/>
<CodeGeneration>
<Generate Value="Faster"/>
</CodeGeneration>
diff --git a/prototypes/fpgui2/tests/bitmaptest.dpr b/prototypes/fpgui2/tests/bitmaptest.dpr
deleted file mode 100644
index c8b98193..00000000
--- a/prototypes/fpgui2/tests/bitmaptest.dpr
+++ /dev/null
@@ -1,67 +0,0 @@
-program bitmaptest;
-
-{$mode objfpc}{$H+}
-
-uses
- Classes,
- SysUtils,
- gfxbase,
- fpgfx,
- gfx_imgfmt_bmp,
- gui_form;
-
-type
-
- { TMainForm }
-
- TMainForm = class(TfpgForm)
- public
- procedure AfterCreate; override;
- procedure HandlePaint; override;
- end;
-
-
- { TMainForm }
-
- procedure TMainForm.AfterCreate;
- begin
- SetPosition(100, 100, 256, 256);
- WindowTitle := 'fpGUI Bitmap Test';
- end;
-
- procedure TMainForm.HandlePaint;
- var
- img: TfpgImage;
- i, j: integer;
- begin
- Canvas.BeginDraw; // activate double buffering in time.
- inherited HandlePaint;
-
- img := TfpgImage.Create;
- img.AllocateImage(32, 256, 256);
- img.UpdateImage;
- // populate the bitmap with pretty colors :-)
- for j := 0 to 255 do
- for i := 0 to 255 do
- PLongWord(img.ImageData)[j * 256 + i] := (i shl 16) or (j shl 8);
-
- Canvas.DrawImage(0, 0, img);
- img.Free;
- Canvas.EndDraw;
- end;
-
- procedure MainProc;
- var
- frm: TMainForm;
- begin
- fpgApplication.Initialize;
- frm := TMainForm.Create(nil);
- frm.Show;
- fpgApplication.Run;
- end;
-
-
-begin
- MainProc;
-end.
-
diff --git a/prototypes/fpgui2/tests/bitmaptest.lpi b/prototypes/fpgui2/tests/bitmaptest.lpi
deleted file mode 100644
index 844bcc82..00000000
--- a/prototypes/fpgui2/tests/bitmaptest.lpi
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<CONFIG>
- <ProjectOptions>
- <PathDelim Value="/"/>
- <Version Value="5"/>
- <General>
- <Flags>
- <SaveOnlyProjectUnits Value="True"/>
- </Flags>
- <SessionStorage Value="InProjectDir"/>
- <MainUnit Value="0"/>
- <IconPath Value="./"/>
- <TargetFileExt Value=""/>
- <Title Value="bitmaptest"/>
- </General>
- <VersionInfo>
- <ProjectVersion Value=""/>
- </VersionInfo>
- <PublishOptions>
- <Version Value="2"/>
- <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)"/>
- </local>
- </RunParams>
- <RequiredPackages Count="1">
- <Item1>
- <PackageName Value="fpGFX2"/>
- </Item1>
- </RequiredPackages>
- <Units Count="2">
- <Unit0>
- <Filename Value="bitmaptest.dpr"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="bitmaptest"/>
- </Unit0>
- <Unit1>
- <Filename Value="uhelpers.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="uhelpers"/>
- </Unit1>
- </Units>
- </ProjectOptions>
- <CompilerOptions>
- <Version Value="5"/>
- <SearchPaths>
- <IncludeFiles Value="../source/"/>
- <OtherUnitFiles Value="../source/;../source/x11/;../gui/"/>
- </SearchPaths>
- <CodeGeneration>
- <Generate Value="Faster"/>
- </CodeGeneration>
- <Other>
- <CustomOptions Value="-FUunits
-"/>
- <CompilerPath Value="$(CompPath)"/>
- </Other>
- </CompilerOptions>
-</CONFIG>
diff --git a/prototypes/fpgui2/tests/edittest.dpr b/prototypes/fpgui2/tests/edittest.dpr
index 31a85587..500be048 100644
--- a/prototypes/fpgui2/tests/edittest.dpr
+++ b/prototypes/fpgui2/tests/edittest.dpr
@@ -229,7 +229,7 @@ begin
Height := 21;
State := 0;
- image := LoadImage_BMP(SetDirSeparators('../images/themes/luna/button.bmp'));
+ image := LoadImage_BMP(SetDirSeparators('../../../images/themes/luna/button.bmp'));
image.CreateMaskFromSample(0, 0);
image.UpdateImage;
if not Assigned(image) then
@@ -255,7 +255,7 @@ end;
bmp: TfpgImage;
i: integer;
begin
- bmp := LoadImage_BMP(SetDirSeparators('../images/themes/luna/button.bmp'));
+ bmp := LoadImage_BMP(SetDirSeparators('../../../images/themes/luna/button.bmp'));
bmp.CreateMaskFromSample(0, 0);
bmp.UpdateImage;
@@ -359,7 +359,7 @@ end;
xpsilver.Top := 230;
xpsilver.Width := 75;
xpsilver.Text := 'XP Silver';
- bmp := LoadImage_BMP(SetDirSeparators('../images/themes/silver/button.bmp'));
+ bmp := LoadImage_BMP(SetDirSeparators('../../../images/themes/silver/button.bmp'));
bmp.CreateMaskFromSample(0, 0);
bmp.UpdateImage;
xpsilver.ThemeImage := bmp;
diff --git a/prototypes/fpgui2/tests/edittest.lpi b/prototypes/fpgui2/tests/edittest.lpi
index 3e9244a7..c96925dd 100644
--- a/prototypes/fpgui2/tests/edittest.lpi
+++ b/prototypes/fpgui2/tests/edittest.lpi
@@ -28,7 +28,8 @@
</RunParams>
<RequiredPackages Count="1">
<Item1>
- <PackageName Value="fpGFX2"/>
+ <PackageName Value="fpgui_package"/>
+ <MinVersion Minor="5" Valid="True"/>
</Item1>
</RequiredPackages>
<Units Count="2">
diff --git a/prototypes/fpgui2/tests/themetest.lpi b/prototypes/fpgui2/tests/themetest.lpi
index 7ec6778f..2e9f7080 100644
--- a/prototypes/fpgui2/tests/themetest.lpi
+++ b/prototypes/fpgui2/tests/themetest.lpi
@@ -28,7 +28,8 @@
</RunParams>
<RequiredPackages Count="1">
<Item1>
- <PackageName Value="fpGFX2"/>
+ <PackageName Value="fpgui_package"/>
+ <MinVersion Minor="5" Valid="True"/>
</Item1>
</RequiredPackages>
<Units Count="1">
diff --git a/prototypes/fpgui2/tests/themetest.lpr b/prototypes/fpgui2/tests/themetest.lpr
index ed4cc66b..7a99a55b 100644
--- a/prototypes/fpgui2/tests/themetest.lpr
+++ b/prototypes/fpgui2/tests/themetest.lpr
@@ -196,7 +196,7 @@ begin
inherited Create(AOwner);
Width := 17;
State := 0;
- image := LoadImage_BMP(SetDirSeparators('../images/themes/luna/scrollbar.bmp'));
+ image := LoadImage_BMP(SetDirSeparators('../../../images/themes/luna/scrollbar.bmp'));
// image.CreateMaskFromSample(0, 0);
image.UpdateImage;
@@ -369,7 +369,7 @@ begin
Height := 21;
State := 0;
- image := LoadImage_BMP(SetDirSeparators('../images/themes/luna/button.bmp'));
+ image := LoadImage_BMP(SetDirSeparators('../../../images/themes/luna/button.bmp'));
image.CreateMaskFromSample(0, 0);
image.UpdateImage;
if not Assigned(image) then
@@ -414,7 +414,7 @@ begin
xpsilver.Top := 45;
xpsilver.Width := 75;
xpsilver.Text := 'XP Silver';
- bmp := LoadImage_BMP(SetDirSeparators('../images/themes/silver/button.bmp'));
+ bmp := LoadImage_BMP(SetDirSeparators('../../../images/themes/silver/button.bmp'));
bmp.CreateMaskFromSample(0, 0);
bmp.UpdateImage;
xpsilver.ThemeImage := bmp;
@@ -424,7 +424,7 @@ procedure TMainForm.CreateScrollbars;
var
bmp: TfpgImage;
begin
- bmp := LoadImage_BMP(SetDirSeparators('../images/themes/silver/scrollbar.bmp'));
+ bmp := LoadImage_BMP(SetDirSeparators('../../../images/themes/silver/scrollbar.bmp'));
bmp.UpdateImage;
sbluna := TThemeScrollBar.Create(self);
@@ -468,7 +468,7 @@ begin
inherited HandlePaint;
- image := LoadImage_BMP(SetDirSeparators('../images/themes/luna/scrollbar.bmp'));
+ image := LoadImage_BMP(SetDirSeparators('../../../images/themes/luna/scrollbar.bmp'));
// image.CreateMaskFromSample(0, 0);
image.UpdateImage;
diff --git a/src/corelib/x11/fpGFX2.pas b/src/corelib/x11/fpGFX2.pas
deleted file mode 100644
index d4a75395..00000000
--- a/src/corelib/x11/fpGFX2.pas
+++ /dev/null
@@ -1,17 +0,0 @@
-{ This file was automatically created by Lazarus. Do not edit!
-This source is only used to compile and install the package.
- }
-
-unit fpGFX2;
-
-interface
-
-uses
- x11_xft, x11_keyconv, gfxbase, gfxbaseinterfaces, gfx_x11, fpgfx,
- gfx_stdimages, gfx_imgfmt_bmp, gfx_widget, gui_form, gui_label, gui_button,
- gui_edit, gui_combobox, gui_popupwindow, gui_scrollbar, gfx_UTF8utils,
- gui_dialogs, gui_listbox, gui_memo, gfx_extinterpolation;
-
-implementation
-
-end.
diff --git a/src/corelib/x11/fpGFX2.lpk b/src/corelib/x11/fpgfx_package.lpk
index 5255aeb1..1521ea5a 100644
--- a/src/corelib/x11/fpGFX2.lpk
+++ b/src/corelib/x11/fpgfx_package.lpk
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="2">
- <Name Value="fpGFX2"/>
+ <Name Value="fpgfx_package"/>
<Author Value="Graeme Geldenhuys"/>
<CompilerOptions>
<Version Value="5"/>
@@ -19,12 +19,12 @@
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
- <Description Value="fpGFX redesign with multiple handles per window
+ <Description Value="fpGUI redesign with multiple handles
"/>
<License Value="Modified LGPL
"/>
- <Version Minor="1"/>
- <Files Count="21">
+ <Version Minor="5"/>
+ <Files Count="10">
<Item1>
<Filename Value="x11_xft.pas"/>
<UnitName Value="x11_xft"/>
@@ -38,77 +38,33 @@
<UnitName Value="gfxbase"/>
</Item3>
<Item4>
- <Filename Value="../gfxbaseinterfaces.pas"/>
- <UnitName Value="gfxbaseinterfaces"/>
- </Item4>
- <Item5>
<Filename Value="gfx_x11.pas"/>
<UnitName Value="gfx_x11"/>
- </Item5>
- <Item6>
+ </Item4>
+ <Item5>
<Filename Value="../fpgfx.pas"/>
<UnitName Value="fpgfx"/>
- </Item6>
- <Item7>
+ </Item5>
+ <Item6>
<Filename Value="../gfx_stdimages.pas"/>
<UnitName Value="gfx_stdimages"/>
- </Item7>
- <Item8>
+ </Item6>
+ <Item7>
<Filename Value="../gfx_imgfmt_bmp.pas"/>
<UnitName Value="gfx_imgfmt_bmp"/>
- </Item8>
- <Item9>
+ </Item7>
+ <Item8>
<Filename Value="../gfx_widget.pas"/>
<UnitName Value="gfx_widget"/>
- </Item9>
- <Item10>
- <Filename Value="../../gui/gui_form.pas"/>
- <UnitName Value="gui_form"/>
- </Item10>
- <Item11>
- <Filename Value="../../gui/gui_label.pas"/>
- <UnitName Value="gui_label"/>
- </Item11>
- <Item12>
- <Filename Value="../../gui/gui_button.pas"/>
- <UnitName Value="gui_button"/>
- </Item12>
- <Item13>
- <Filename Value="../../gui/gui_edit.pas"/>
- <UnitName Value="gui_edit"/>
- </Item13>
- <Item14>
- <Filename Value="../../gui/gui_combobox.pas"/>
- <UnitName Value="gui_combobox"/>
- </Item14>
- <Item15>
- <Filename Value="../../gui/gui_popupwindow.pas"/>
- <UnitName Value="gui_popupwindow"/>
- </Item15>
- <Item16>
- <Filename Value="../../gui/gui_scrollbar.pas"/>
- <UnitName Value="gui_scrollbar"/>
- </Item16>
- <Item17>
+ </Item8>
+ <Item9>
<Filename Value="../gfx_utf8utils.pas"/>
<UnitName Value="gfx_UTF8utils"/>
- </Item17>
- <Item18>
- <Filename Value="../../gui/gui_dialogs.pas"/>
- <UnitName Value="gui_dialogs"/>
- </Item18>
- <Item19>
- <Filename Value="../../gui/gui_listbox.pas"/>
- <UnitName Value="gui_listbox"/>
- </Item19>
- <Item20>
- <Filename Value="../../gui/gui_memo.pas"/>
- <UnitName Value="gui_memo"/>
- </Item20>
- <Item21>
+ </Item9>
+ <Item10>
<Filename Value="../gfx_extinterpolation.pas"/>
<UnitName Value="gfx_extinterpolation"/>
- </Item21>
+ </Item10>
</Files>
<RequiredPkgs Count="1">
<Item1>
diff --git a/src/corelib/x11/fpgfx_package.pas b/src/corelib/x11/fpgfx_package.pas
new file mode 100644
index 00000000..0fc83352
--- /dev/null
+++ b/src/corelib/x11/fpgfx_package.pas
@@ -0,0 +1,15 @@
+{ This file was automatically created by Lazarus. Do not edit!
+This source is only used to compile and install the package.
+ }
+
+unit fpgfx_package;
+
+interface
+
+uses
+ x11_xft, x11_keyconv, gfxbase, gfx_x11, fpgfx, gfx_stdimages, gfx_imgfmt_bmp,
+ gfx_widget, gfx_UTF8utils, gfx_extinterpolation;
+
+implementation
+
+end.
diff --git a/src/gui/fpgui_package.lpk b/src/gui/fpgui_package.lpk
new file mode 100644
index 00000000..ea9896d3
--- /dev/null
+++ b/src/gui/fpgui_package.lpk
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<CONFIG>
+ <Package Version="2">
+ <Name Value="fpgui_package"/>
+ <Author Value="Graeme Geldenhuys"/>
+ <CompilerOptions>
+ <Version Value="5"/>
+ <SearchPaths>
+ <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/"/>
+ </SearchPaths>
+ <CodeGeneration>
+ <Generate Value="Faster"/>
+ </CodeGeneration>
+ <Other>
+ <CompilerPath Value="$(CompPath)"/>
+ </Other>
+ </CompilerOptions>
+ <Description Value="fpGUI - multi-handle redesign"/>
+ <License Value="Modified LGPL"/>
+ <Version Minor="5"/>
+ <Files Count="10">
+ <Item1>
+ <Filename Value="gui_button.pas"/>
+ <UnitName Value="gui_button"/>
+ </Item1>
+ <Item2>
+ <Filename Value="gui_combobox.pas"/>
+ <UnitName Value="gui_combobox"/>
+ </Item2>
+ <Item3>
+ <Filename Value="gui_dialogs.pas"/>
+ <UnitName Value="gui_dialogs"/>
+ </Item3>
+ <Item4>
+ <Filename Value="gui_edit.pas"/>
+ <UnitName Value="gui_edit"/>
+ </Item4>
+ <Item5>
+ <Filename Value="gui_form.pas"/>
+ <UnitName Value="gui_form"/>
+ </Item5>
+ <Item6>
+ <Filename Value="gui_label.pas"/>
+ <UnitName Value="gui_label"/>
+ </Item6>
+ <Item7>
+ <Filename Value="gui_listbox.pas"/>
+ <UnitName Value="gui_listbox"/>
+ </Item7>
+ <Item8>
+ <Filename Value="gui_memo.pas"/>
+ <UnitName Value="gui_memo"/>
+ </Item8>
+ <Item9>
+ <Filename Value="gui_popupwindow.pas"/>
+ <UnitName Value="gui_popupwindow"/>
+ </Item9>
+ <Item10>
+ <Filename Value="gui_scrollbar.pas"/>
+ <UnitName Value="gui_scrollbar"/>
+ </Item10>
+ </Files>
+ <RequiredPkgs Count="2">
+ <Item1>
+ <PackageName Value="fpgfx_package"/>
+ <MinVersion Minor="5" Valid="True"/>
+ </Item1>
+ <Item2>
+ <PackageName Value="FCL"/>
+ <MinVersion Major="1" Valid="True"/>
+ </Item2>
+ </RequiredPkgs>
+ <UsageOptions>
+ <UnitPath Value="$(PkgOutDir)/"/>
+ </UsageOptions>
+ <PublishOptions>
+ <Version Value="2"/>
+ <IgnoreBinaries Value="False"/>
+ </PublishOptions>
+ </Package>
+</CONFIG>
diff --git a/src/gui/fpgui_package.pas b/src/gui/fpgui_package.pas
new file mode 100644
index 00000000..dcdc16ba
--- /dev/null
+++ b/src/gui/fpgui_package.pas
@@ -0,0 +1,15 @@
+{ This file was automatically created by Lazarus. Do not edit!
+This source is only used to compile and install the package.
+ }
+
+unit fpgui_package;
+
+interface
+
+uses
+ gui_button, gui_combobox, gui_dialogs, gui_edit, gui_form, gui_label,
+ gui_listbox, gui_memo, gui_popupwindow, gui_scrollbar;
+
+implementation
+
+end.