Fixed two example projects that did not compile.

* apps/docedit
* gui/combobox

5 files changed, 28 insertions, 38 deletions

diff --git a/examples/apps/docedit/docedit.lpi b/examples/apps/docedit/docedit.lpi
index 98b5cf0f..640d3114 100644
--- a/examples/apps/docedit/docedit.lpi
+++ b/examples/apps/docedit/docedit.lpi
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="/"/>
-    <Version Value="6"/>
+    <Version Value="7"/>
     <General>
       <Flags>
         <SaveOnlyProjectUnits Value="True"/>
+        <LRSInOutputDirectory Value="False"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <IconPath Value="./"/>
       <TargetFileExt Value=""/>
     </General>
     <VersionInfo>
@@ -31,7 +30,7 @@
         <PackageName Value="fpgui_toolkit"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="8">
+    <Units Count="7">
       <Unit0>
         <Filename Value="docedit.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -58,27 +57,19 @@
         <UnitName Value="FPDEUtil"/>
       </Unit4>
       <Unit5>
-        <Filename Value="pkeditor.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="PkEditor"/>
-      </Unit5>
-      <Unit6>
         <Filename Value="doceditmsg.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="doceditmsg"/>
-      </Unit6>
-      <Unit7>
+      </Unit5>
+      <Unit6>
         <Filename Value="doceditopts.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="doceditopts"/>
-      </Unit7>
+      </Unit6>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/examples/apps/docedit/docedit.lpr b/examples/apps/docedit/docedit.lpr
index e9a6a915..07f849e5 100644
--- a/examples/apps/docedit/docedit.lpr
+++ b/examples/apps/docedit/docedit.lpr
@@ -7,9 +7,8 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Classes,
-  fpgfx,
-  frm_main, frm_options, model, FPDEUtil, PkEditor, doceditmsg, doceditopts,
-  fpgui_toolkit;
+  fpg_main,
+  frm_main, frm_options, model, FPDEUtil, doceditmsg, doceditopts;
 
 
 procedure MainProc;
diff --git a/examples/apps/docedit/frm_main.pas b/examples/apps/docedit/frm_main.pas
index e2ddca95..04ea3f59 100644
--- a/examples/apps/docedit/frm_main.pas
+++ b/examples/apps/docedit/frm_main.pas
@@ -11,16 +11,16 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gui_form,
-  gui_button,
-  gui_edit,
-  gui_label,
-  gui_menu,
-  gui_memo,
-  gui_tree,
-  gui_bevel,
+  fpg_base,
+  fpg_main,
+  fpg_form,
+  fpg_button,
+  fpg_edit,
+  fpg_label,
+  fpg_menu,
+  fpg_memo,
+  fpg_tree,
+  fpg_panel,
   dom, XMLWrite, XMLRead, contnrs, model;
 
 type
@@ -63,7 +63,7 @@ type
 implementation
 
 uses
-  gui_dialogs, frm_options;
+  fpg_dialogs, frm_options;
   
   
 const
diff --git a/examples/apps/docedit/frm_options.pas b/examples/apps/docedit/frm_options.pas
index 0b552317..95538577 100644
--- a/examples/apps/docedit/frm_options.pas
+++ b/examples/apps/docedit/frm_options.pas
@@ -5,12 +5,12 @@ unit frm_options;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_listbox, gui_memo, gui_combobox, gui_grid, 
-  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, 
-  gui_progressbar, gui_radiobutton, gui_tab, gui_menu,
-  gui_bevel;
+  SysUtils, Classes, fpg_base, fpg_main, fpg_edit,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_listbox, fpg_memo, fpg_combobox, fpg_grid,
+  fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar,
+  fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu,
+  fpg_panel;
 
 type
 
diff --git a/examples/apps/docedit/pkeditor.pas b/examples/apps/docedit/pkeditor.pas
index 0dcde7f1..57caf197 100644
--- a/examples/apps/docedit/pkeditor.pas
+++ b/examples/apps/docedit/pkeditor.pas
@@ -27,8 +27,8 @@ unit PkEditor;
 interface
 
 uses
-  SysUtils, Classes, DOM, gui_bevel, gui_label, gui_tree, gui_menu,
-  gfx_imagelist, FPDEUtil, doceditmsg, doceditopts;
+  SysUtils, Classes, DOM, fpg_panel, fpg_label, fpg_tree, fpg_menu,
+  fpg_imagelist, FPDEUtil, doceditmsg, doceditopts;
 
 Type
   { TPackageEditor }