* Removed the annoying unit that Lazarus IDE keeps adding to the examples.

* Updated the build scripts to compile the new package unit.

18 files changed, 18 insertions, 21 deletions

diff --git a/examples/gui/alignment/aligntest.lpr b/examples/gui/alignment/aligntest.lpr
index 8fe9cec9..a13b5ffd 100644
--- a/examples/gui/alignment/aligntest.lpr
+++ b/examples/gui/alignment/aligntest.lpr
@@ -4,7 +4,7 @@ program aligntest;
 
 uses
   Classes, SysUtils,
-  fpgfx, gfxbase, gfx_widget, gui_form, gui_label, fpgui_toolkit;
+  fpgfx, gfxbase, gfx_widget, gui_form, gui_label;
 
 type
   TMainForm = class(TfpgForm)
diff --git a/examples/gui/animation/anim_test.lpr b/examples/gui/animation/anim_test.lpr
index c83ce2c2..10cf9286 100644
--- a/examples/gui/animation/anim_test.lpr
+++ b/examples/gui/animation/anim_test.lpr
@@ -9,7 +9,7 @@ uses
   Classes, SysUtils,
   // fpGUI
   fpgfx, gui_form, gfxbase, gui_button,
-  gui_label, gui_trackbar, gui_animation, fpgui_toolkit;
+  gui_label, gui_trackbar, gui_animation;
 
 type
 
diff --git a/examples/gui/bevel/beveltest.lpr b/examples/gui/bevel/beveltest.lpr
index f7af7cea..3b7deb9d 100644
--- a/examples/gui/bevel/beveltest.lpr
+++ b/examples/gui/bevel/beveltest.lpr
@@ -12,7 +12,7 @@ uses
   gui_form,
   gui_button,
   gui_panel,
-  gui_label, fpgui_toolkit;
+  gui_label;
   
 type
   TMainForm = class(TfpgForm)
diff --git a/examples/gui/calendar/calendartest.lpr b/examples/gui/calendar/calendartest.lpr
index 0ae6e1ba..a38e3727 100644
--- a/examples/gui/calendar/calendartest.lpr
+++ b/examples/gui/calendar/calendartest.lpr
@@ -11,8 +11,7 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Classes, SysUtils, gfxbase, fpgfx, gui_form, gui_popupcalendar, gui_edit,
-  gui_button, gui_label, gfx_popupwindow, gui_combobox, gui_checkbox, dateutils,
-  fpgui_toolkit;
+  gui_button, gui_label, gfx_popupwindow, gui_combobox, gui_checkbox, dateutils;
 
 type
   TMainForm = class(TfpgForm)
diff --git a/examples/gui/colorlistbox/colorlistboxtest.lpr b/examples/gui/colorlistbox/colorlistboxtest.lpr
index 7407f49a..6bea991c 100644
--- a/examples/gui/colorlistbox/colorlistboxtest.lpr
+++ b/examples/gui/colorlistbox/colorlistboxtest.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frmMain, fpgui_toolkit;
+  Classes, fpgfx, frmMain;
 
 
 procedure MainProc;
diff --git a/examples/gui/combobox/comboboxtest.lpr b/examples/gui/combobox/comboboxtest.lpr
index eb531b7b..a3a38da1 100644
--- a/examples/gui/combobox/comboboxtest.lpr
+++ b/examples/gui/combobox/comboboxtest.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frm_main, fpgui_toolkit;
+  Classes, fpgfx, frm_main;
 
 procedure MainProc;
 var
diff --git a/examples/gui/command_interface/test.lpr b/examples/gui/command_interface/test.lpr
index 4cdf2667..dcf20851 100644
--- a/examples/gui/command_interface/test.lpr
+++ b/examples/gui/command_interface/test.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, gui_form, frm_main, commands, fpgui_toolkit;
+  Classes, fpgfx, gui_form, frm_main, commands;
 
 
 procedure MainProc;
diff --git a/examples/gui/dbtest/dbtest.lpr b/examples/gui/dbtest/dbtest.lpr
index 3a30a10a..28d2bd2b 100644
--- a/examples/gui/dbtest/dbtest.lpr
+++ b/examples/gui/dbtest/dbtest.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frm_main, fpgui_toolkit;
+  Classes, fpgfx, frm_main;
 
 
 procedure MainProc;
diff --git a/examples/gui/filegrid/filegrid.lpr b/examples/gui/filegrid/filegrid.lpr
index 3492d1be..07af9520 100644
--- a/examples/gui/filegrid/filegrid.lpr
+++ b/examples/gui/filegrid/filegrid.lpr
@@ -13,7 +13,7 @@ uses
   gui_form,
   gui_grid,
   gui_checkbox,
-  gui_button, fpgui_toolkit;
+  gui_button;
 
 type
 
diff --git a/examples/gui/fontselect/fontselect.lpr b/examples/gui/fontselect/fontselect.lpr
index 6fef097f..640eec05 100644
--- a/examples/gui/fontselect/fontselect.lpr
+++ b/examples/gui/fontselect/fontselect.lpr
@@ -14,7 +14,7 @@ uses
   gui_listbox,
   gui_edit,
   gui_label,
-  gfx_constants, fpgui_toolkit;
+  gfx_constants;
   
   
 resourcestring
diff --git a/examples/gui/listbox/listboxtest.lpr b/examples/gui/listbox/listboxtest.lpr
index 9a7dd7c8..f36e2ed8 100644
--- a/examples/gui/listbox/listboxtest.lpr
+++ b/examples/gui/listbox/listboxtest.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frm_main, fpgui_toolkit;
+  Classes, fpgfx, frm_main;
 
 procedure MainProc;
 var
diff --git a/examples/gui/listviewtest/listviewtest.lpr b/examples/gui/listviewtest/listviewtest.lpr
index 6151ff8b..553e2d53 100644
--- a/examples/gui/listviewtest/listviewtest.lpr
+++ b/examples/gui/listviewtest/listviewtest.lpr
@@ -4,8 +4,7 @@ program listviewtest;
 
 uses
   Classes, fpgfx, sysutils ,
-  gui_listview, gui_form, gui_button, gui_edit, gfxbase, gui_checkbox,
-  fpgui_toolkit;
+  gui_listview, gui_form, gui_button, gui_edit, gfxbase, gui_checkbox;
   
 type
 
diff --git a/examples/gui/splashscreen/test.lpr b/examples/gui/splashscreen/test.lpr
index 51177fc6..008d602b 100644
--- a/examples/gui/splashscreen/test.lpr
+++ b/examples/gui/splashscreen/test.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, gui_form, frm_main, commands, frm_splashscreen, fpgui_toolkit;
+  Classes, fpgfx, gui_form, frm_main, commands, frm_splashscreen;
 
 
 procedure MainProc;
diff --git a/examples/gui/sprites/spritedemo.lpr b/examples/gui/sprites/spritedemo.lpr
index 14cd06e5..12adc82c 100644
--- a/examples/gui/sprites/spritedemo.lpr
+++ b/examples/gui/sprites/spritedemo.lpr
@@ -7,7 +7,7 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Classes, SysUtils,
-  gfxbase, fpgfx, gui_form, gfx_imgfmt_bmp, fpgui_toolkit;
+  gfxbase, fpgfx, gui_form, gfx_imgfmt_bmp;
 
 type
 
diff --git a/examples/gui/stdimages/stdimglist.lpr b/examples/gui/stdimages/stdimglist.lpr
index d0ffa87d..1bcdcb91 100644
--- a/examples/gui/stdimages/stdimglist.lpr
+++ b/examples/gui/stdimages/stdimglist.lpr
@@ -4,7 +4,7 @@ program stdimglist;
 
 uses
   Classes, SysUtils,
-  fpgfx, gfxbase, gui_form, gfx_imgfmt_bmp, gui_button, fpgui_toolkit;
+  fpgfx, gfxbase, gui_form, gfx_imgfmt_bmp, gui_button;
 
 type
 
diff --git a/examples/gui/tabtest/tabtest.lpr b/examples/gui/tabtest/tabtest.lpr
index db1c6388..80ea97e5 100644
--- a/examples/gui/tabtest/tabtest.lpr
+++ b/examples/gui/tabtest/tabtest.lpr
@@ -7,7 +7,7 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Classes, fpgfx, gfx_widget, gfxbase, gui_form, gui_tab, gui_button,
-  gui_label, gui_edit, gui_checkbox, gui_combobox, fpgui_toolkit;
+  gui_label, gui_edit, gui_checkbox, gui_combobox;
 
 type
   TMainForm = class(TfpgForm)
diff --git a/examples/gui/timertest/timertest.lpr b/examples/gui/timertest/timertest.lpr
index bef9d441..e4189a73 100644
--- a/examples/gui/timertest/timertest.lpr
+++ b/examples/gui/timertest/timertest.lpr
@@ -6,8 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, SysUtils, fpgfx, gfxbase, gui_form, gui_button, gui_label,
-  fpgui_toolkit;
+  Classes, SysUtils, fpgfx, gfxbase, gui_form, gui_button, gui_label;
 
 type
   TMainForm = class(TfpgForm)
diff --git a/examples/gui/wulinetest/wuline_test.lpr b/examples/gui/wulinetest/wuline_test.lpr
index 5febb965..7459b0f2 100644
--- a/examples/gui/wulinetest/wuline_test.lpr
+++ b/examples/gui/wulinetest/wuline_test.lpr
@@ -7,7 +7,7 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Classes, SysUtils, gfxbase, fpgfx, gui_form, gui_button, math,
-  gfx_imgfmt_bmp, gfx_wuline, gui_bevel, gui_radiobutton, fpgui_toolkit;
+  gfx_imgfmt_bmp, gfx_wuline, gui_bevel, gui_radiobutton;
 
 type