Restructure Part 5.

* Created new packages for Corelib and GUI.
* Updated all examples to use the new packages.
Restructure should now be complete.

5 files changed, 128 insertions, 78 deletions

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.