1 files changed, 152 insertions, 123 deletions
diff --git a/src/corelib/gdi/fpgui_toolkit.lpk b/src/corelib/gdi/fpgui_toolkit.lpk
index f9d9af72..a4f927c2 100644
--- a/src/corelib/gdi/fpgui_toolkit.lpk
+++ b/src/corelib/gdi/fpgui_toolkit.lpk
@@ -10,7 +10,7 @@
       <PathDelim Value="\"/>
       <SearchPaths>
         <IncludeFiles Value="..\..;..\render\software"/>
-        <OtherUnitFiles Value="..;..\..\gui;..\..\gui\db;..\render\software"/>
+        <OtherUnitFiles Value="..;..\..\gui;..\..\gui\db;..\render\software;..\..\reportengine"/>
         <UnitOutputDirectory Value="..\..\..\lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Parsing>
@@ -25,13 +25,14 @@
         </Optimizations>
       </CodeGeneration>
       <Other>
+        <CustomOptions Value="-dAggCanvasX"/>
         <CompilerPath Value="$(CompPath)"/>
       </Other>
     </CompilerOptions>
     <Description Value="fpGUI Toolkit"/>
     <License Value="LGPL 2 with static linking exception."/>
-    <Version Minor="8" Build="0"/>
-    <Files Count="89">
+    <Version Minor="8"/>
+    <Files Count="96">
       <Item1>
         <Filename Value="..\stdimages.inc"/>
         <Type Value="Include"/>
@@ -149,247 +150,275 @@
         <Type Value="Include"/>
       </Item29>
       <Item30>
-        <Filename Value="..\..\gui\promptuserdialog.inc"/>
-        <Type Value="Include"/>
+        <Filename Value="fpg_impl.pas"/>
+        <UnitName Value="fpg_impl"/>
       </Item30>
       <Item31>
-        <Filename Value="..\..\gui\fpg_animation.pas"/>
-        <UnitName Value="fpg_animation"/>
+        <Filename Value="fpg_utils_impl.inc"/>
+        <Type Value="Include"/>
       </Item31>
       <Item32>
-        <Filename Value="..\..\gui\fpg_basegrid.pas"/>
-        <UnitName Value="fpg_basegrid"/>
+        <Filename Value="fpg_gdi.pas"/>
+        <UnitName Value="fpg_gdi"/>
       </Item32>
       <Item33>
-        <Filename Value="..\..\gui\fpg_button.pas"/>
-        <UnitName Value="fpg_button"/>
+        <Filename Value="fpg_keys_gdi.inc"/>
+        <Type Value="Include"/>
       </Item33>
       <Item34>
-        <Filename Value="..\..\gui\fpg_checkbox.pas"/>
-        <UnitName Value="fpg_checkbox"/>
+        <Filename Value="fpg_oledragdrop.pas"/>
+        <UnitName Value="fpg_OLEDragDrop"/>
       </Item34>
       <Item35>
-        <Filename Value="..\..\gui\fpg_combobox.pas"/>
-        <UnitName Value="fpg_combobox"/>
+        <Filename Value="..\..\gui\promptuserdialog.inc"/>
+        <Type Value="Include"/>
       </Item35>
       <Item36>
-        <Filename Value="..\..\gui\fpg_customgrid.pas"/>
-        <UnitName Value="fpg_customgrid"/>
+        <Filename Value="..\..\gui\fpg_animation.pas"/>
+        <UnitName Value="fpg_animation"/>
       </Item36>
       <Item37>
-        <Filename Value="..\..\gui\fpg_dialogs.pas"/>
-        <UnitName Value="fpg_dialogs"/>
+        <Filename Value="..\..\gui\fpg_basegrid.pas"/>
+        <UnitName Value="fpg_basegrid"/>
       </Item37>
       <Item38>
-        <Filename Value="..\..\gui\fpg_editcombo.pas"/>
-        <UnitName Value="fpg_editcombo"/>
+        <Filename Value="..\..\gui\fpg_button.pas"/>
+        <UnitName Value="fpg_button"/>
       </Item38>
       <Item39>
-        <Filename Value="..\..\gui\fpg_edit.pas"/>
-        <UnitName Value="fpg_edit"/>
+        <Filename Value="..\..\gui\fpg_checkbox.pas"/>
+        <UnitName Value="fpg_checkbox"/>
       </Item39>
       <Item40>
-        <Filename Value="..\..\gui\fpg_form.pas"/>
-        <UnitName Value="fpg_form"/>
+        <Filename Value="..\..\gui\fpg_combobox.pas"/>
+        <UnitName Value="fpg_combobox"/>
       </Item40>
       <Item41>
-        <Filename Value="..\..\gui\fpg_gauge.pas"/>
-        <UnitName Value="fpg_gauge"/>
+        <Filename Value="..\..\gui\fpg_customgrid.pas"/>
+        <UnitName Value="fpg_customgrid"/>
       </Item41>
       <Item42>
-        <Filename Value="..\..\gui\fpg_grid.pas"/>
-        <UnitName Value="fpg_grid"/>
+        <Filename Value="..\..\gui\fpg_dialogs.pas"/>
+        <UnitName Value="fpg_dialogs"/>
       </Item42>
       <Item43>
-        <Filename Value="..\..\gui\fpg_hyperlink.pas"/>
-        <UnitName Value="fpg_hyperlink"/>
+        <Filename Value="..\..\gui\fpg_editcombo.pas"/>
+        <UnitName Value="fpg_editcombo"/>
       </Item43>
       <Item44>
-        <Filename Value="..\..\gui\fpg_iniutils.pas"/>
-        <UnitName Value="fpg_iniutils"/>
+        <Filename Value="..\..\gui\fpg_edit.pas"/>
+        <UnitName Value="fpg_edit"/>
       </Item44>
       <Item45>
-        <Filename Value="..\..\gui\fpg_label.pas"/>
-        <UnitName Value="fpg_label"/>
+        <Filename Value="..\..\gui\fpg_form.pas"/>
+        <UnitName Value="fpg_form"/>
       </Item45>
       <Item46>
-        <Filename Value="..\..\gui\fpg_listbox.pas"/>
-        <UnitName Value="fpg_listbox"/>
+        <Filename Value="..\..\gui\fpg_gauge.pas"/>
+        <UnitName Value="fpg_gauge"/>
       </Item46>
       <Item47>
-        <Filename Value="..\..\gui\fpg_listview.pas"/>
-        <UnitName Value="fpg_listview"/>
+        <Filename Value="..\..\gui\fpg_grid.pas"/>
+        <UnitName Value="fpg_grid"/>
       </Item47>
       <Item48>
-        <Filename Value="..\..\gui\fpg_memo.pas"/>
-        <UnitName Value="fpg_memo"/>
+        <Filename Value="..\..\gui\fpg_hyperlink.pas"/>
+        <UnitName Value="fpg_hyperlink"/>
       </Item48>
       <Item49>
-        <Filename Value="..\..\gui\fpg_menu.pas"/>
-        <UnitName Value="fpg_menu"/>
+        <Filename Value="..\..\gui\fpg_iniutils.pas"/>
+        <UnitName Value="fpg_iniutils"/>
       </Item49>
       <Item50>
-        <Filename Value="..\..\gui\fpg_mru.pas"/>
-        <UnitName Value="fpg_mru"/>
+        <Filename Value="..\..\gui\fpg_label.pas"/>
+        <UnitName Value="fpg_label"/>
       </Item50>
       <Item51>
-        <Filename Value="..\..\gui\fpg_panel.pas"/>
-        <UnitName Value="fpg_panel"/>
+        <Filename Value="..\..\gui\fpg_listbox.pas"/>
+        <UnitName Value="fpg_listbox"/>
       </Item51>
       <Item52>
-        <Filename Value="..\..\gui\fpg_popupcalendar.pas"/>
-        <UnitName Value="fpg_popupcalendar"/>
+        <Filename Value="..\..\gui\fpg_listview.pas"/>
+        <UnitName Value="fpg_listview"/>
       </Item52>
       <Item53>
-        <Filename Value="..\..\gui\fpg_progressbar.pas"/>
-        <UnitName Value="fpg_progressbar"/>
+        <Filename Value="..\..\gui\fpg_memo.pas"/>
+        <UnitName Value="fpg_memo"/>
       </Item53>
       <Item54>
-        <Filename Value="..\..\gui\fpg_radiobutton.pas"/>
-        <UnitName Value="fpg_radiobutton"/>
+        <Filename Value="..\..\gui\fpg_menu.pas"/>
+        <UnitName Value="fpg_menu"/>
       </Item54>
       <Item55>
-        <Filename Value="..\..\gui\fpg_scrollbar.pas"/>
-        <UnitName Value="fpg_scrollbar"/>
+        <Filename Value="..\..\gui\fpg_mru.pas"/>
+        <UnitName Value="fpg_mru"/>
       </Item55>
       <Item56>
-        <Filename Value="..\..\gui\fpg_style.pas"/>
-        <UnitName Value="fpg_style"/>
+        <Filename Value="..\..\gui\fpg_panel.pas"/>
+        <UnitName Value="fpg_panel"/>
       </Item56>
       <Item57>
-        <Filename Value="..\..\gui\fpg_tab.pas"/>
-        <UnitName Value="fpg_tab"/>
+        <Filename Value="..\..\gui\fpg_popupcalendar.pas"/>
+        <UnitName Value="fpg_popupcalendar"/>
       </Item57>
       <Item58>
-        <Filename Value="..\..\gui\fpg_trackbar.pas"/>
-        <UnitName Value="fpg_trackbar"/>
+        <Filename Value="..\..\gui\fpg_progressbar.pas"/>
+        <UnitName Value="fpg_progressbar"/>
       </Item58>
       <Item59>
-        <Filename Value="..\..\gui\fpg_tree.pas"/>
-        <UnitName Value="fpg_tree"/>
+        <Filename Value="..\..\gui\fpg_radiobutton.pas"/>
+        <UnitName Value="fpg_radiobutton"/>
       </Item59>
       <Item60>
-        <Filename Value="..\..\gui\logo.inc"/>
-        <Type Value="Include"/>
+        <Filename Value="..\..\gui\fpg_scrollbar.pas"/>
+        <UnitName Value="fpg_scrollbar"/>
       </Item60>
       <Item61>
-        <Filename Value="..\..\gui\messagedialog.inc"/>
-        <Type Value="Include"/>
+        <Filename Value="..\..\gui\fpg_style.pas"/>
+        <UnitName Value="fpg_style"/>
       </Item61>
       <Item62>
-        <Filename Value="..\..\gui\newdirdialog.inc"/>
-        <Type Value="Include"/>
+        <Filename Value="..\..\gui\fpg_tab.pas"/>
+        <UnitName Value="fpg_tab"/>
       </Item62>
       <Item63>
-        <Filename Value="..\..\gui\db\fpgui_db.pas"/>
-        <UnitName Value="fpgui_db"/>
+        <Filename Value="..\..\gui\fpg_trackbar.pas"/>
+        <UnitName Value="fpg_trackbar"/>
       </Item63>
       <Item64>
-        <Filename Value="fpg_utils_impl.inc"/>
-        <Type Value="Include"/>
+        <Filename Value="..\..\gui\fpg_tree.pas"/>
+        <UnitName Value="fpg_tree"/>
       </Item64>
       <Item65>
-        <Filename Value="fpg_gdi.pas"/>
-        <UnitName Value="fpg_gdi"/>
+        <Filename Value="..\..\gui\logo.inc"/>
+        <Type Value="Include"/>
       </Item65>
       <Item66>
-        <Filename Value="fpg_impl.pas"/>
-        <UnitName Value="fpg_impl"/>
+        <Filename Value="..\..\gui\messagedialog.inc"/>
+        <Type Value="Include"/>
       </Item66>
       <Item67>
-        <Filename Value="fpg_keys_gdi.inc"/>
+        <Filename Value="..\..\gui\newdirdialog.inc"/>
         <Type Value="Include"/>
       </Item67>
       <Item68>
-        <Filename Value="..\..\gui\fpg_splitter.pas"/>
-        <UnitName Value="fpg_splitter"/>
+        <Filename Value="..\..\gui\selectdirdialog.inc"/>
+        <Type Value="Include"/>
       </Item68>
       <Item69>
-        <Filename Value="..\..\gui\fpg_hint.pas"/>
-        <UnitName Value="fpg_hint"/>
+        <Filename Value="..\..\gui\db\fpgui_db.pas"/>
+        <UnitName Value="fpgui_db"/>
       </Item69>
       <Item70>
-        <Filename Value="..\..\gui\fpg_spinedit.pas"/>
-        <UnitName Value="fpg_spinedit"/>
+        <Filename Value="..\..\gui\fpg_splitter.pas"/>
+        <UnitName Value="fpg_splitter"/>
       </Item70>
       <Item71>
-        <Filename Value="..\fpg_extgraphics.pas"/>
-        <UnitName Value="fpg_extgraphics"/>
+        <Filename Value="..\..\gui\fpg_hint.pas"/>
+        <UnitName Value="fpg_hint"/>
       </Item71>
       <Item72>
-        <Filename Value="..\..\gui\fpg_colormapping.pas"/>
-        <UnitName Value="fpg_ColorMapping"/>
+        <Filename Value="..\..\gui\fpg_spinedit.pas"/>
+        <UnitName Value="fpg_spinedit"/>
       </Item72>
       <Item73>
-        <Filename Value="..\..\gui\fpg_colorwheel.pas"/>
-        <UnitName Value="fpg_ColorWheel"/>
+        <Filename Value="..\fpg_extgraphics.pas"/>
+        <UnitName Value="fpg_extgraphics"/>
       </Item73>
       <Item74>
-        <Filename Value="fpg_interface.pas"/>
-        <UnitName Value="fpg_interface"/>
+        <Filename Value="..\..\gui\charmapdialog.inc"/>
+        <Type Value="Include"/>
       </Item74>
       <Item75>
-        <Filename Value="..\..\gui\fpg_editbtn.pas"/>
-        <UnitName Value="fpg_editbtn"/>
+        <Filename Value="..\..\gui\fpg_colormapping.pas"/>
+        <UnitName Value="fpg_ColorMapping"/>
       </Item75>
       <Item76>
-        <Filename Value="..\..\gui\colordialog.inc"/>
-        <Type Value="Include"/>
+        <Filename Value="..\..\gui\fpg_colorwheel.pas"/>
+        <UnitName Value="fpg_ColorWheel"/>
       </Item76>
       <Item77>
-        <Filename Value="..\fpg_imgfmt_jpg.pas"/>
-        <UnitName Value="fpg_imgfmt_jpg"/>
+        <Filename Value="fpg_interface.pas"/>
+        <UnitName Value="fpg_interface"/>
       </Item77>
       <Item78>
-        <Filename Value="..\..\gui\inputquerydialog.inc"/>
-        <Type Value="Include"/>
+        <Filename Value="..\..\gui\fpg_editbtn.pas"/>
+        <UnitName Value="fpg_editbtn"/>
       </Item78>
       <Item79>
-        <Filename Value="..\fpg_imgutils.pas"/>
-        <UnitName Value="fpg_imgutils"/>
+        <Filename Value="..\..\gui\colordialog.inc"/>
+        <Type Value="Include"/>
       </Item79>
       <Item80>
-        <Filename Value="..\..\VERSION_FILE.inc"/>
-        <Type Value="Include"/>
+        <Filename Value="..\fpg_imgfmt_jpg.pas"/>
+        <UnitName Value="fpg_imgfmt_jpg"/>
       </Item80>
       <Item81>
-        <Filename Value="fpg_oledragdrop.pas"/>
-        <UnitName Value="fpg_OLEDragDrop"/>
+        <Filename Value="..\..\gui\inputquerydialog.inc"/>
+        <Type Value="Include"/>
       </Item81>
       <Item82>
-        <Filename Value="..\..\gui\fpg_stylemanager.pas"/>
-        <UnitName Value="fpg_stylemanager"/>
+        <Filename Value="..\fpg_imgutils.pas"/>
+        <UnitName Value="fpg_imgutils"/>
       </Item82>
       <Item83>
-        <Filename Value="..\..\gui\fpg_style_win2k.pas"/>
-        <UnitName Value="fpg_style_win2k"/>
+        <Filename Value="..\..\VERSION_FILE.inc"/>
+        <Type Value="Include"/>
       </Item83>
       <Item84>
-        <Filename Value="..\..\gui\fpg_style_motif.pas"/>
-        <UnitName Value="fpg_style_motif"/>
+        <Filename Value="..\..\gui\fpg_stylemanager.pas"/>
+        <UnitName Value="fpg_stylemanager"/>
       </Item84>
       <Item85>
-        <Filename Value="..\..\gui\fpg_style_clearlooks.pas"/>
-        <UnitName Value="fpg_style_clearlooks"/>
+        <Filename Value="..\..\gui\fpg_style_win2k.pas"/>
+        <UnitName Value="fpg_style_win2k"/>
       </Item85>
       <Item86>
-        <Filename Value="..\..\gui\fpg_style_bluecurve.pas"/>
-        <UnitName Value="fpg_style_bluecurve"/>
+        <Filename Value="..\..\gui\fpg_style_motif.pas"/>
+        <UnitName Value="fpg_style_motif"/>
       </Item86>
       <Item87>
-        <Filename Value="..\..\gui\fpg_style_bitmap.pas"/>
-        <UnitName Value="fpg_style_bitmap"/>
+        <Filename Value="..\..\gui\fpg_style_clearlooks.pas"/>
+        <UnitName Value="fpg_style_clearlooks"/>
       </Item87>
       <Item88>
-        <Filename Value="..\..\gui\fpg_readonly.pas"/>
-        <UnitName Value="fpg_readonly"/>
+        <Filename Value="..\..\gui\fpg_style_bluecurve.pas"/>
+        <UnitName Value="fpg_style_bluecurve"/>
       </Item88>
       <Item89>
+        <Filename Value="..\..\gui\fpg_style_bitmap.pas"/>
+        <UnitName Value="fpg_style_bitmap"/>
+      </Item89>
+      <Item90>
+        <Filename Value="..\..\gui\fpg_readonly.pas"/>
+        <UnitName Value="fpg_readonly"/>
+      </Item90>
+      <Item91>
         <Filename Value="..\fpg_imgfmt_png.pas"/>
         <UnitName Value="fpg_imgfmt_png"/>
-      </Item89>
+      </Item91>
+      <Item92>
+        <Filename Value="..\..\reportengine\u_command.pas"/>
+        <UnitName Value="U_Command"/>
+      </Item92>
+      <Item93>
+        <Filename Value="..\..\reportengine\u_pdf.pas"/>
+        <UnitName Value="U_Pdf"/>
+      </Item93>
+      <Item94>
+        <Filename Value="..\..\reportengine\u_report.pas"/>
+        <UnitName Value="U_Report"/>
+      </Item94>
+      <Item95>
+        <Filename Value="..\..\reportengine\u_reportimages.pas"/>
+        <UnitName Value="U_ReportImages"/>
+      </Item95>
+      <Item96>
+        <Filename Value="..\..\reportengine\u_visu.pas"/>
+        <UnitName Value="U_Visu"/>
+      </Item96>
     </Files>
-    <LazDoc Paths="..\..\..\docs\xml\corelib;..\..\..\docs\xml\corelib\x11;..\..\..\docs\xml\corelib\gdi;..\..\..\docs\xml\gui"/>
+    <LazDoc Paths="../../../docs/xml/corelib;../../../docs/xml/corelib/x11;../../../docs/xml/corelib/gdi;../../../docs/xml/gui"/>
     <RequiredPkgs Count="1">
       <Item1>
         <PackageName Value="FCL"/>
@@ -404,4 +433,4 @@
       <IgnoreBinaries Value="False"/>
     </PublishOptions>
   </Package>
-</CONFIG>
-\ No newline at end of file
+</CONFIG>