* Minor fixes to get fpGUI to compile under Windows. After the unit name changes.

3 files changed, 334 insertions, 342 deletions

diff --git a/src/corelib/gdi/gfx_impl.pas b/src/corelib/gdi/fpg_impl.pas
index 3aabb3d6..ad0916b9 100644
--- a/src/corelib/gdi/gfx_impl.pas
+++ b/src/corelib/gdi/fpg_impl.pas
@@ -1,4 +1,4 @@
-unit gfx_impl;
+unit fpg_impl;
 
 {$mode objfpc}{$H+}
 
diff --git a/src/corelib/gdi/fpgui_toolkit.lpk b/src/corelib/gdi/fpgui_toolkit.lpk
index ab4189f9..61ab6a60 100644
--- a/src/corelib/gdi/fpgui_toolkit.lpk
+++ b/src/corelib/gdi/fpgui_toolkit.lpk
@@ -1,331 +1,324 @@
-<?xml version="1.0"?>
-<CONFIG>
-  <Package Version="2">
-    <PathDelim Value="\"/>
-    <Name Value="fpgui_toolkit"/>
-    <Author Value="Graeme Geldenhuys"/>
-    <CompilerOptions>
-      <Version Value="5"/>
-      <PathDelim Value="\"/>
-      <SearchPaths>
-        <OtherUnitFiles Value="..\;..\..\gui\;..\..\gui\db\"/>
-        <UnitOutputDirectory Value="..\..\..\lib"/>
-      </SearchPaths>
-      <Parsing>
-        <SyntaxOptions>
-          <CStyleOperator Value="False"/>
-          <AllowLabel Value="False"/>
-          <CPPInline Value="False"/>
-        </SyntaxOptions>
-      </Parsing>
-      <CodeGeneration>
-        <Generate Value="Faster"/>
-      </CodeGeneration>
-      <Other>
-        <CompilerPath Value="$(CompPath)"/>
-      </Other>
-    </CompilerOptions>
+<?xml version="1.0"?>

+<CONFIG>

+  <Package Version="3">

+    <PathDelim Value="\"/>

+    <Name Value="fpgui_toolkit"/>

+    <Author Value="Graeme Geldenhuys"/>

+    <CompilerOptions>

+      <Version Value="8"/>

+      <PathDelim Value="\"/>

+      <SearchPaths>

+        <OtherUnitFiles Value="..\;..\..\gui\;..\..\gui\db\"/>

+        <UnitOutputDirectory Value="..\..\..\lib"/>

+      </SearchPaths>

+      <Parsing>

+        <SyntaxOptions>

+          <CStyleOperator Value="False"/>

+          <AllowLabel Value="False"/>

+          <CPPInline Value="False"/>

+        </SyntaxOptions>

+      </Parsing>

+      <Other>

+        <CompilerPath Value="$(CompPath)"/>

+      </Other>

+    </CompilerOptions>

     <Description Value="fpGUI Toolkit
-"/>
+"/>

     <License Value="Modified LGPL
-"/>
-    <Version Minor="6" Release="2"/>
-    <Files Count="70">
-      <Item1>
-        <Filename Value="..\stdimages.inc"/>
-        <Type Value="Include"/>
-      </Item1>
-      <Item2>
-        <Filename Value="..\fpg_base.pas"/>
-        <UnitName Value="fpg_base"/>
-      </Item2>
-      <Item3>
-        <Filename Value="..\fpg_main.pas"/>
-        <UnitName Value="fpg_main"/>
-      </Item3>
-      <Item4>
-        <Filename Value="..\fpg_cmdlineparams.pas"/>
-        <UnitName Value="fpg_cmdlineparams"/>
-      </Item4>
-      <Item5>
-        <Filename Value="..\fpg_command_intf.pas"/>
-        <UnitName Value="fpg_command_intf"/>
-      </Item5>
-      <Item6>
-        <Filename Value="..\fpg_constants.pas"/>
-        <UnitName Value="fpg_constants"/>
-      </Item6>
-      <Item7>
-        <Filename Value="..\fpg_extinterpolation.pas"/>
-        <UnitName Value="fpg_extinterpolation"/>
-      </Item7>
-      <Item8>
-        <Filename Value="..\fpg_imagelist.pas"/>
-        <UnitName Value="fpg_imagelist"/>
-      </Item8>
-      <Item9>
-        <Filename Value="..\fpg_imgfmt_bmp.pas"/>
-        <UnitName Value="fpg_imgfmt_bmp"/>
-      </Item9>
-      <Item10>
-        <Filename Value="..\fpg_msgqueue.inc"/>
-        <Type Value="Include"/>
-      </Item10>
-      <Item11>
-        <Filename Value="..\fpg_pofiles.pas"/>
-        <UnitName Value="fpg_pofiles"/>
-      </Item11>
-      <Item12>
-        <Filename Value="..\fpg_popupwindow.pas"/>
-        <UnitName Value="fpg_popupwindow"/>
-      </Item12>
-      <Item13>
-        <Filename Value="..\fpg_stdimages.pas"/>
-        <UnitName Value="fpg_stdimages"/>
-      </Item13>
-      <Item14>
-        <Filename Value="..\fpg_stringhashlist.pas"/>
-        <UnitName Value="fpg_stringhashlist"/>
-      </Item14>
-      <Item15>
-        <Filename Value="..\fpg_translations.pas"/>
-        <UnitName Value="fpg_translations"/>
-      </Item15>
-      <Item16>
-        <Filename Value="..\fpg_stringutils.pas"/>
-        <UnitName Value="fpg_stringutils"/>
-      </Item16>
-      <Item17>
-        <Filename Value="..\fpg_utils.pas"/>
-        <UnitName Value="fpg_utils"/>
-      </Item17>
-      <Item18>
-        <Filename Value="..\fpg_widget.pas"/>
-        <UnitName Value="fpg_widget"/>
-      </Item18>
-      <Item19>
-        <Filename Value="..\fpg_wuline.pas"/>
-        <UnitName Value="fpg_wuline"/>
-      </Item19>
-      <Item20>
-        <Filename Value="..\keys.inc"/>
-        <Type Value="Include"/>
-      </Item20>
-      <Item21>
-        <Filename Value="..\lang_afrikaans.inc"/>
-        <Type Value="Include"/>
-      </Item21>
-      <Item22>
-        <Filename Value="..\lang_english.inc"/>
-        <Type Value="Include"/>
-      </Item22>
-      <Item23>
-        <Filename Value="..\lang_french.inc"/>
-        <Type Value="Include"/>
-      </Item23>
-      <Item24>
-        <Filename Value="..\lang_german.inc"/>
-        <Type Value="Include"/>
-      </Item24>
-      <Item25>
-        <Filename Value="..\lang_italian.inc"/>
-        <Type Value="Include"/>
-      </Item25>
-      <Item26>
-        <Filename Value="..\lang_portuguese.inc"/>
-        <Type Value="Include"/>
-      </Item26>
-      <Item27>
-        <Filename Value="..\lang_russian.inc"/>
-        <Type Value="Include"/>
-      </Item27>
-      <Item28>
-        <Filename Value="..\lang_spanish.inc"/>
-        <Type Value="Include"/>
-      </Item28>
-      <Item29>
-        <Filename Value="..\predefinedcolors.inc"/>
-        <Type Value="Include"/>
-      </Item29>
-      <Item30>
-        <Filename Value="..\..\gui\promptuserdialog.inc"/>
-        <Type Value="Include"/>
-      </Item30>
-      <Item31>
-        <Filename Value="..\..\gui\gui_animation.pas"/>
-        <UnitName Value="gui_animation"/>
-      </Item31>
-      <Item32>
-        <Filename Value="..\..\gui\gui_basegrid.pas"/>
-        <UnitName Value="gui_basegrid"/>
-      </Item32>
-      <Item33>
-        <Filename Value="..\..\gui\gui_bevel.pas"/>
-        <UnitName Value="gui_bevel"/>
-      </Item33>
-      <Item34>
-        <Filename Value="..\..\gui\gui_button.pas"/>
-        <UnitName Value="gui_button"/>
-      </Item34>
-      <Item35>
-        <Filename Value="..\..\gui\gui_checkbox.pas"/>
-        <UnitName Value="gui_checkbox"/>
-      </Item35>
-      <Item36>
-        <Filename Value="..\..\gui\gui_combobox.pas"/>
-        <UnitName Value="gui_combobox"/>
-      </Item36>
-      <Item37>
-        <Filename Value="..\..\gui\gui_customgrid.pas"/>
-        <UnitName Value="gui_customgrid"/>
-      </Item37>
-      <Item38>
-        <Filename Value="..\..\gui\gui_dialogs.pas"/>
-        <UnitName Value="gui_dialogs"/>
-      </Item38>
-      <Item39>
-        <Filename Value="..\..\gui\gui_editcombo.pas"/>
-        <UnitName Value="gui_editcombo"/>
-      </Item39>
-      <Item40>
-        <Filename Value="..\..\gui\gui_edit.pas"/>
-        <UnitName Value="gui_edit"/>
-      </Item40>
-      <Item41>
-        <Filename Value="..\..\gui\gui_form.pas"/>
-        <UnitName Value="gui_form"/>
-      </Item41>
-      <Item42>
-        <Filename Value="..\..\gui\gui_gauge.pas"/>
-        <UnitName Value="gui_gauge"/>
-      </Item42>
-      <Item43>
-        <Filename Value="..\..\gui\gui_grid.pas"/>
-        <UnitName Value="gui_grid"/>
-      </Item43>
-      <Item44>
-        <Filename Value="..\..\gui\gui_hyperlink.pas"/>
-        <UnitName Value="gui_hyperlink"/>
-      </Item44>
-      <Item45>
-        <Filename Value="..\..\gui\gui_iniutils.pas"/>
-        <UnitName Value="gui_iniutils"/>
-      </Item45>
-      <Item46>
-        <Filename Value="..\..\gui\gui_label.pas"/>
-        <UnitName Value="gui_label"/>
-      </Item46>
-      <Item47>
-        <Filename Value="..\..\gui\gui_listbox.pas"/>
-        <UnitName Value="gui_listbox"/>
-      </Item47>
-      <Item48>
-        <Filename Value="..\..\gui\gui_listview.pas"/>
-        <UnitName Value="gui_listview"/>
-      </Item48>
-      <Item49>
-        <Filename Value="..\..\gui\gui_memo.pas"/>
-        <UnitName Value="gui_memo"/>
-      </Item49>
-      <Item50>
-        <Filename Value="..\..\gui\gui_menu.pas"/>
-        <UnitName Value="gui_menu"/>
-      </Item50>
-      <Item51>
-        <Filename Value="..\..\gui\gui_mru.pas"/>
-        <UnitName Value="gui_mru"/>
-      </Item51>
-      <Item52>
-        <Filename Value="..\..\gui\gui_panel.pas"/>
-        <UnitName Value="gui_panel"/>
-      </Item52>
-      <Item53>
-        <Filename Value="..\..\gui\gui_popupcalendar.pas"/>
-        <UnitName Value="gui_popupcalendar"/>
-      </Item53>
-      <Item54>
-        <Filename Value="..\..\gui\gui_progressbar.pas"/>
-        <UnitName Value="gui_progressbar"/>
-      </Item54>
-      <Item55>
-        <Filename Value="..\..\gui\gui_radiobutton.pas"/>
-        <UnitName Value="gui_radiobutton"/>
-      </Item55>
-      <Item56>
-        <Filename Value="..\..\gui\gui_scrollbar.pas"/>
-        <UnitName Value="gui_scrollbar"/>
-      </Item56>
-      <Item57>
-        <Filename Value="..\..\gui\gui_style.pas"/>
-        <UnitName Value="gui_style"/>
-      </Item57>
-      <Item58>
-        <Filename Value="..\..\gui\gui_tab.pas"/>
-        <UnitName Value="gui_tab"/>
-      </Item58>
-      <Item59>
-        <Filename Value="..\..\gui\gui_trackbar.pas"/>
-        <UnitName Value="gui_trackbar"/>
-      </Item59>
-      <Item60>
-        <Filename Value="..\..\gui\gui_tree.pas"/>
-        <UnitName Value="gui_tree"/>
-      </Item60>
-      <Item61>
-        <Filename Value="..\..\gui\logo.inc"/>
-        <Type Value="Include"/>
-      </Item61>
-      <Item62>
-        <Filename Value="..\..\gui\messagedialog.inc"/>
-        <Type Value="Include"/>
-      </Item62>
-      <Item63>
-        <Filename Value="..\..\gui\newdirdialog.inc"/>
-        <Type Value="Include"/>
-      </Item63>
-      <Item64>
-        <Filename Value="..\..\gui\db\fpgui_db.pas"/>
-        <UnitName Value="fpgui_db"/>
-      </Item64>
-      <Item65>
-        <Filename Value="fpg_utils_impl.inc"/>
-        <Type Value="Include"/>
-      </Item65>
-      <Item66>
-        <Filename Value="fpg_gdi.pas"/>
-        <UnitName Value="fpg_gdi"/>
-      </Item66>
-      <Item67>
-        <Filename Value="fpg_impl.pas"/>
-        <UnitName Value="fpg_impl"/>
-      </Item67>
-      <Item68>
-        <Filename Value="fpg_keys_gdi.inc"/>
-        <Type Value="Include"/>
-      </Item68>
-      <Item69>
-        <Filename Value="..\..\gui\gui_splitter.pas"/>
-        <UnitName Value="gui_splitter"/>
-      </Item69>
-      <Item70>
-        <Filename Value="..\..\gui\gui_hint.pas"/>
-        <UnitName Value="gui_hint"/>
-      </Item70>
-    </Files>
-    <LazDoc Paths="..\..\..\docs\xml\corelib\;..\..\..\docs\xml\corelib\x11\;..\..\..\docs\xml\corelib\gdi\;..\..\..\docs\xml\gui\"/>
-    <RequiredPkgs Count="1">
-      <Item1>
-        <PackageName Value="FCL"/>
-        <MinVersion Major="1" Valid="True"/>
-      </Item1>
-    </RequiredPkgs>
-    <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)\"/>
-    </UsageOptions>
-    <PublishOptions>
-      <Version Value="2"/>
-      <DestinationDirectory Value="$(TestDir)\publishedpackage\"/>
-      <IgnoreBinaries Value="False"/>
-    </PublishOptions>
-  </Package>
-</CONFIG>
+"/>

+    <Version Minor="6" Release="2"/>

+    <Files Count="69">

+      <Item1>

+        <Filename Value="..\stdimages.inc"/>

+        <Type Value="Include"/>

+      </Item1>

+      <Item2>

+        <Filename Value="..\fpg_base.pas"/>

+        <UnitName Value="fpg_base"/>

+      </Item2>

+      <Item3>

+        <Filename Value="..\fpg_main.pas"/>

+        <UnitName Value="fpg_main"/>

+      </Item3>

+      <Item4>

+        <Filename Value="..\fpg_cmdlineparams.pas"/>

+        <UnitName Value="fpg_cmdlineparams"/>

+      </Item4>

+      <Item5>

+        <Filename Value="..\fpg_command_intf.pas"/>

+        <UnitName Value="fpg_command_intf"/>

+      </Item5>

+      <Item6>

+        <Filename Value="..\fpg_constants.pas"/>

+        <UnitName Value="fpg_constants"/>

+      </Item6>

+      <Item7>

+        <Filename Value="..\fpg_extinterpolation.pas"/>

+        <UnitName Value="fpg_extinterpolation"/>

+      </Item7>

+      <Item8>

+        <Filename Value="..\fpg_imagelist.pas"/>

+        <UnitName Value="fpg_imagelist"/>

+      </Item8>

+      <Item9>

+        <Filename Value="..\fpg_imgfmt_bmp.pas"/>

+        <UnitName Value="fpg_imgfmt_bmp"/>

+      </Item9>

+      <Item10>

+        <Filename Value="..\fpg_msgqueue.inc"/>

+        <Type Value="Include"/>

+      </Item10>

+      <Item11>

+        <Filename Value="..\fpg_pofiles.pas"/>

+        <UnitName Value="fpg_pofiles"/>

+      </Item11>

+      <Item12>

+        <Filename Value="..\fpg_popupwindow.pas"/>

+        <UnitName Value="fpg_popupwindow"/>

+      </Item12>

+      <Item13>

+        <Filename Value="..\fpg_stdimages.pas"/>

+        <UnitName Value="fpg_stdimages"/>

+      </Item13>

+      <Item14>

+        <Filename Value="..\fpg_stringhashlist.pas"/>

+        <UnitName Value="fpg_stringhashlist"/>

+      </Item14>

+      <Item15>

+        <Filename Value="..\fpg_translations.pas"/>

+        <UnitName Value="fpg_translations"/>

+      </Item15>

+      <Item16>

+        <Filename Value="..\fpg_stringutils.pas"/>

+        <UnitName Value="fpg_stringutils"/>

+      </Item16>

+      <Item17>

+        <Filename Value="..\fpg_utils.pas"/>

+        <UnitName Value="fpg_utils"/>

+      </Item17>

+      <Item18>

+        <Filename Value="..\fpg_widget.pas"/>

+        <UnitName Value="fpg_widget"/>

+      </Item18>

+      <Item19>

+        <Filename Value="..\fpg_wuline.pas"/>

+        <UnitName Value="fpg_wuline"/>

+      </Item19>

+      <Item20>

+        <Filename Value="..\keys.inc"/>

+        <Type Value="Include"/>

+      </Item20>

+      <Item21>

+        <Filename Value="..\lang_afrikaans.inc"/>

+        <Type Value="Include"/>

+      </Item21>

+      <Item22>

+        <Filename Value="..\lang_english.inc"/>

+        <Type Value="Include"/>

+      </Item22>

+      <Item23>

+        <Filename Value="..\lang_french.inc"/>

+        <Type Value="Include"/>

+      </Item23>

+      <Item24>

+        <Filename Value="..\lang_german.inc"/>

+        <Type Value="Include"/>

+      </Item24>

+      <Item25>

+        <Filename Value="..\lang_italian.inc"/>

+        <Type Value="Include"/>

+      </Item25>

+      <Item26>

+        <Filename Value="..\lang_portuguese.inc"/>

+        <Type Value="Include"/>

+      </Item26>

+      <Item27>

+        <Filename Value="..\lang_russian.inc"/>

+        <Type Value="Include"/>

+      </Item27>

+      <Item28>

+        <Filename Value="..\lang_spanish.inc"/>

+        <Type Value="Include"/>

+      </Item28>

+      <Item29>

+        <Filename Value="..\predefinedcolors.inc"/>

+        <Type Value="Include"/>

+      </Item29>

+      <Item30>

+        <Filename Value="..\..\gui\promptuserdialog.inc"/>

+        <Type Value="Include"/>

+      </Item30>

+      <Item31>

+        <Filename Value="..\..\gui\gui_animation.pas"/>

+        <UnitName Value="gui_animation"/>

+      </Item31>

+      <Item32>

+        <Filename Value="..\..\gui\gui_basegrid.pas"/>

+        <UnitName Value="gui_basegrid"/>

+      </Item32>

+      <Item33>

+        <Filename Value="..\..\gui\gui_button.pas"/>

+        <UnitName Value="gui_button"/>

+      </Item33>

+      <Item34>

+        <Filename Value="..\..\gui\gui_checkbox.pas"/>

+        <UnitName Value="gui_checkbox"/>

+      </Item34>

+      <Item35>

+        <Filename Value="..\..\gui\gui_combobox.pas"/>

+        <UnitName Value="gui_combobox"/>

+      </Item35>

+      <Item36>

+        <Filename Value="..\..\gui\gui_customgrid.pas"/>

+        <UnitName Value="gui_customgrid"/>

+      </Item36>

+      <Item37>

+        <Filename Value="..\..\gui\gui_dialogs.pas"/>

+        <UnitName Value="gui_dialogs"/>

+      </Item37>

+      <Item38>

+        <Filename Value="..\..\gui\gui_editcombo.pas"/>

+        <UnitName Value="gui_editcombo"/>

+      </Item38>

+      <Item39>

+        <Filename Value="..\..\gui\gui_edit.pas"/>

+        <UnitName Value="gui_edit"/>

+      </Item39>

+      <Item40>

+        <Filename Value="..\..\gui\gui_form.pas"/>

+        <UnitName Value="gui_form"/>

+      </Item40>

+      <Item41>

+        <Filename Value="..\..\gui\gui_gauge.pas"/>

+        <UnitName Value="gui_gauge"/>

+      </Item41>

+      <Item42>

+        <Filename Value="..\..\gui\gui_grid.pas"/>

+        <UnitName Value="gui_grid"/>

+      </Item42>

+      <Item43>

+        <Filename Value="..\..\gui\gui_hyperlink.pas"/>

+        <UnitName Value="gui_hyperlink"/>

+      </Item43>

+      <Item44>

+        <Filename Value="..\..\gui\gui_iniutils.pas"/>

+        <UnitName Value="gui_iniutils"/>

+      </Item44>

+      <Item45>

+        <Filename Value="..\..\gui\gui_label.pas"/>

+        <UnitName Value="gui_label"/>

+      </Item45>

+      <Item46>

+        <Filename Value="..\..\gui\gui_listbox.pas"/>

+        <UnitName Value="gui_listbox"/>

+      </Item46>

+      <Item47>

+        <Filename Value="..\..\gui\gui_listview.pas"/>

+        <UnitName Value="gui_listview"/>

+      </Item47>

+      <Item48>

+        <Filename Value="..\..\gui\gui_memo.pas"/>

+        <UnitName Value="gui_memo"/>

+      </Item48>

+      <Item49>

+        <Filename Value="..\..\gui\gui_menu.pas"/>

+        <UnitName Value="gui_menu"/>

+      </Item49>

+      <Item50>

+        <Filename Value="..\..\gui\gui_mru.pas"/>

+        <UnitName Value="gui_mru"/>

+      </Item50>

+      <Item51>

+        <Filename Value="..\..\gui\gui_panel.pas"/>

+        <UnitName Value="gui_panel"/>

+      </Item51>

+      <Item52>

+        <Filename Value="..\..\gui\gui_popupcalendar.pas"/>

+        <UnitName Value="gui_popupcalendar"/>

+      </Item52>

+      <Item53>

+        <Filename Value="..\..\gui\gui_progressbar.pas"/>

+        <UnitName Value="gui_progressbar"/>

+      </Item53>

+      <Item54>

+        <Filename Value="..\..\gui\gui_radiobutton.pas"/>

+        <UnitName Value="gui_radiobutton"/>

+      </Item54>

+      <Item55>

+        <Filename Value="..\..\gui\gui_scrollbar.pas"/>

+        <UnitName Value="gui_scrollbar"/>

+      </Item55>

+      <Item56>

+        <Filename Value="..\..\gui\gui_style.pas"/>

+        <UnitName Value="gui_style"/>

+      </Item56>

+      <Item57>

+        <Filename Value="..\..\gui\gui_tab.pas"/>

+        <UnitName Value="gui_tab"/>

+      </Item57>

+      <Item58>

+        <Filename Value="..\..\gui\gui_trackbar.pas"/>

+        <UnitName Value="gui_trackbar"/>

+      </Item58>

+      <Item59>

+        <Filename Value="..\..\gui\gui_tree.pas"/>

+        <UnitName Value="gui_tree"/>

+      </Item59>

+      <Item60>

+        <Filename Value="..\..\gui\logo.inc"/>

+        <Type Value="Include"/>

+      </Item60>

+      <Item61>

+        <Filename Value="..\..\gui\messagedialog.inc"/>

+        <Type Value="Include"/>

+      </Item61>

+      <Item62>

+        <Filename Value="..\..\gui\newdirdialog.inc"/>

+        <Type Value="Include"/>

+      </Item62>

+      <Item63>

+        <Filename Value="..\..\gui\db\fpgui_db.pas"/>

+        <UnitName Value="fpgui_db"/>

+      </Item63>

+      <Item64>

+        <Filename Value="fpg_utils_impl.inc"/>

+        <Type Value="Include"/>

+      </Item64>

+      <Item65>

+        <Filename Value="fpg_gdi.pas"/>

+        <UnitName Value="fpg_gdi"/>

+      </Item65>

+      <Item66>

+        <Filename Value="fpg_impl.pas"/>

+        <UnitName Value="fpg_impl"/>

+      </Item66>

+      <Item67>

+        <Filename Value="fpg_keys_gdi.inc"/>

+        <Type Value="Include"/>

+      </Item67>

+      <Item68>

+        <Filename Value="..\..\gui\gui_splitter.pas"/>

+        <UnitName Value="gui_splitter"/>

+      </Item68>

+      <Item69>

+        <Filename Value="..\..\gui\gui_hint.pas"/>

+        <UnitName Value="gui_hint"/>

+      </Item69>

+    </Files>

+    <LazDoc Paths="..\..\..\docs\xml\corelib\;..\..\..\docs\xml\corelib\x11\;..\..\..\docs\xml\corelib\gdi\;..\..\..\docs\xml\gui\"/>

+    <RequiredPkgs Count="1">

+      <Item1>

+        <PackageName Value="FCL"/>

+        <MinVersion Major="1" Valid="True"/>

+      </Item1>

+    </RequiredPkgs>

+    <UsageOptions>

+      <UnitPath Value="$(PkgOutDir)\"/>

+    </UsageOptions>

+    <PublishOptions>

+      <Version Value="2"/>

+      <DestinationDirectory Value="$(TestDir)\publishedpackage\"/>

+      <IgnoreBinaries Value="False"/>

+    </PublishOptions>

+  </Package>

+</CONFIG>

diff --git a/src/corelib/gdi/fpgui_toolkit.pas b/src/corelib/gdi/fpgui_toolkit.pas
index bce70477..49c99c7a 100644
--- a/src/corelib/gdi/fpgui_toolkit.pas
+++ b/src/corelib/gdi/fpgui_toolkit.pas
@@ -1,5 +1,5 @@
-{ This file was automatically created by Lazarus. Do not edit!
-This source is only used to compile and install the package.
+{ This file was automatically created by Lazarus. do not edit!
+  This source is only used to compile and install the package.
  }
 
 unit fpgui_toolkit; 
@@ -8,16 +8,15 @@ interface
 
 uses
   fpg_base, fpg_main, fpg_cmdlineparams, fpg_command_intf, fpg_constants, 
-    fpg_extinterpolation, fpg_imagelist, fpg_imgfmt_bmp, fpg_pofiles, 
-    fpg_popupwindow, fpg_stdimages, fpg_stringhashlist, fpg_translations, 
-    fpg_stringutils, fpg_utils, fpg_widget, fpg_wuline, gui_animation, 
-    gui_basegrid, gui_bevel, gui_button, gui_checkbox, gui_combobox, 
-    gui_customgrid, gui_dialogs, gui_editcombo, gui_edit, gui_form, gui_gauge, 
-    gui_grid, gui_hyperlink, gui_iniutils, gui_label, gui_listbox, 
-    gui_listview, gui_memo, gui_menu, gui_mru, gui_panel, gui_popupcalendar, 
-    gui_progressbar, gui_radiobutton, gui_scrollbar, gui_style, gui_tab, 
-    gui_trackbar, gui_tree, fpgui_db, fpg_gdi, fpg_impl, gui_splitter, 
-    gui_hint; 
+  fpg_extinterpolation, fpg_imagelist, fpg_imgfmt_bmp, fpg_pofiles, 
+  fpg_popupwindow, fpg_stdimages, fpg_stringhashlist, fpg_translations, 
+  fpg_stringutils, fpg_utils, fpg_widget, fpg_wuline, gui_animation, 
+  gui_basegrid, gui_button, gui_checkbox, gui_combobox, gui_customgrid, 
+  gui_dialogs, gui_editcombo, gui_edit, gui_form, gui_gauge, gui_grid, 
+  gui_hyperlink, gui_iniutils, gui_label, gui_listbox, gui_listview, gui_memo, 
+  gui_menu, gui_mru, gui_panel, gui_popupcalendar, gui_progressbar, 
+  gui_radiobutton, gui_scrollbar, gui_style, gui_tab, gui_trackbar, gui_tree, 
+  fpgui_db, fpg_gdi, fpg_impl, gui_splitter, gui_hint;
 
 implementation