Skeleton style units.

These will later contain the various style implementations.

9 files changed, 158 insertions, 16 deletions

diff --git a/src/corelib/gdi/fpgui_toolkit.lpk b/src/corelib/gdi/fpgui_toolkit.lpk
index d5cc85ca..dd4289f3 100644
--- a/src/corelib/gdi/fpgui_toolkit.lpk
+++ b/src/corelib/gdi/fpgui_toolkit.lpk
@@ -31,7 +31,7 @@
     <Description Value="fpGUI Toolkit"/>

     <License Value="LGPL 2 with static linking exception."/>

     <Version Minor="7" Build="1"/>

-    <Files Count="81">

+    <Files Count="87">

       <Item1>

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

         <Type Value="Include"/>

@@ -356,6 +356,30 @@
         <Filename Value="fpg_oledragdrop.pas"/>

         <UnitName Value="fpg_OLEDragDrop"/>

       </Item81>

+      <Item82>

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

+        <UnitName Value="fpg_stylemanager"/>

+      </Item82>

+      <Item83>

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

+        <UnitName Value="fpg_style_win2k"/>

+      </Item83>

+      <Item84>

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

+        <UnitName Value="fpg_style_motif"/>

+      </Item84>

+      <Item85>

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

+        <UnitName Value="fpg_style_clearlooks"/>

+      </Item85>

+      <Item86>

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

+        <UnitName Value="fpg_style_bluecurve"/>

+      </Item86>

+      <Item87>

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

+        <UnitName Value="fpg_style_bitmap"/>

+      </Item87>

     </Files>

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

     <RequiredPkgs Count="1">

@@ -372,4 +396,4 @@
       <IgnoreBinaries Value="False"/>

     </PublishOptions>

   </Package>

-</CONFIG>

+</CONFIG>
\ No newline at end of file
diff --git a/src/corelib/gdi/fpgui_toolkit.pas b/src/corelib/gdi/fpgui_toolkit.pas
index adc1c74d..c3ab77f2 100644
--- a/src/corelib/gdi/fpgui_toolkit.pas
+++ b/src/corelib/gdi/fpgui_toolkit.pas
@@ -18,8 +18,10 @@ uses
   fpg_radiobutton, fpg_scrollbar, fpg_style, fpg_tab, fpg_trackbar, fpg_tree, 

   fpgui_db, fpg_gdi, fpg_impl, fpg_splitter, fpg_hint, fpg_spinedit, 

   fpg_extgraphics, fpg_ColorMapping, fpg_ColorWheel, fpg_interface, 

-  fpg_editbtn, fpg_imgfmt_jpg, fpg_imgutils, fpg_OLEDragDrop;

+  fpg_editbtn, fpg_imgfmt_jpg, fpg_imgutils, fpg_OLEDragDrop,

+  fpg_stylemanager, fpg_style_win2k, fpg_style_motif, fpg_style_clearlooks,

+  fpg_style_bluecurve, fpg_style_bitmap;

 

 implementation

 

-end.

+end.
\ No newline at end of file
diff --git a/src/corelib/x11/fpgui_toolkit.lpk b/src/corelib/x11/fpgui_toolkit.lpk
index f3dc36d9..990af24e 100644
--- a/src/corelib/x11/fpgui_toolkit.lpk
+++ b/src/corelib/x11/fpgui_toolkit.lpk
@@ -7,8 +7,8 @@
     <CompilerOptions>
       <Version Value="9"/>
       <SearchPaths>
-        <IncludeFiles Value="../../"/>
-        <OtherUnitFiles Value="../;../../gui/;../../gui/db/"/>
+        <IncludeFiles Value="../.."/>
+        <OtherUnitFiles Value="..;../../gui;../../gui/db"/>
         <UnitOutputDirectory Value="../../../lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Parsing>
@@ -31,7 +31,7 @@
     <License Value="LGPL 2 with static linking exception.
 "/>
     <Version Minor="7" Build="1"/>
-    <Files Count="84">
+    <Files Count="90">
       <Item1>
         <Filename Value="../stdimages.inc"/>
         <Type Value="Include"/>
@@ -368,6 +368,30 @@
         <Filename Value="../../VERSION_FILE.inc"/>
         <Type Value="Include"/>
       </Item84>
+      <Item85>
+        <Filename Value="../../gui/fpg_stylemanager.pas"/>
+        <UnitName Value="fpg_stylemanager"/>
+      </Item85>
+      <Item86>
+        <Filename Value="../../gui/fpg_style_win2k.pas"/>
+        <UnitName Value="fpg_style_win2k"/>
+      </Item86>
+      <Item87>
+        <Filename Value="../../gui/fpg_style_motif.pas"/>
+        <UnitName Value="fpg_style_motif"/>
+      </Item87>
+      <Item88>
+        <Filename Value="../../gui/fpg_style_clearlooks.pas"/>
+        <UnitName Value="fpg_style_clearlooks"/>
+      </Item88>
+      <Item89>
+        <Filename Value="../../gui/fpg_style_bluecurve.pas"/>
+        <UnitName Value="fpg_style_bluecurve"/>
+      </Item89>
+      <Item90>
+        <Filename Value="../../gui/fpg_style_bitmap.pas"/>
+        <UnitName Value="fpg_style_bitmap"/>
+      </Item90>
     </Files>
     <LazDoc Paths="../../../docs/xml/corelib/;../../../docs/xml/corelib/x11/;../../../docs/xml/corelib/gdi/;../../../docs/xml/gui/"/>
     <RequiredPkgs Count="1">
diff --git a/src/corelib/x11/fpgui_toolkit.pas b/src/corelib/x11/fpgui_toolkit.pas
index f9ea7c1d..8f5f99dc 100644
--- a/src/corelib/x11/fpgui_toolkit.pas
+++ b/src/corelib/x11/fpgui_toolkit.pas
@@ -8,16 +8,19 @@ 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, fpg_impl, fpg_x11, fpg_netlayer_x11, fpg_keyconv_x11, 
-  fpg_xft_x11, fpg_animation, fpg_basegrid, fpg_button, fpg_checkbox, fpg_combobox, 
-  fpg_customgrid, fpg_dialogs, fpg_editcombo, fpg_edit, fpg_form, fpg_gauge, fpg_grid, 
-  fpg_hyperlink, fpg_iniutils, fpg_label, fpg_listbox, fpg_listview, fpg_memo, fpg_menu, 
+  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, fpg_impl, fpg_x11, 
+  fpg_netlayer_x11, fpg_keyconv_x11, fpg_xft_x11, fpg_animation, fpg_basegrid, 
+  fpg_button, fpg_checkbox, fpg_combobox, fpg_customgrid, fpg_dialogs, 
+  fpg_editcombo, fpg_edit, fpg_form, fpg_gauge, fpg_grid, fpg_hyperlink, 
+  fpg_iniutils, fpg_label, fpg_listbox, fpg_listview, fpg_memo, fpg_menu, 
   fpg_mru, fpg_panel, fpg_popupcalendar, fpg_progressbar, fpg_radiobutton, 
-  fpg_scrollbar, fpg_style, fpg_tab, fpg_trackbar, fpg_tree, fpgui_db, fpg_splitter, 
-  fpg_hint, fpg_spinedit, fpg_extgraphics, fpg_ColorMapping, fpg_ColorWheel, 
-  fpg_interface, fpg_editbtn, fpg_imgfmt_jpg, fpg_imgutils;
+  fpg_scrollbar, fpg_style, fpg_tab, fpg_trackbar, fpg_tree, fpgui_db, 
+  fpg_splitter, fpg_hint, fpg_spinedit, fpg_extgraphics, fpg_ColorMapping, 
+  fpg_ColorWheel, fpg_interface, fpg_editbtn, fpg_imgfmt_jpg, fpg_imgutils, 
+  fpg_stylemanager, fpg_style_win2k, fpg_style_motif, fpg_style_clearlooks, 
+  fpg_style_bluecurve, fpg_style_bitmap;
 
 implementation
 
diff --git a/src/gui/fpg_style_bitmap.pas b/src/gui/fpg_style_bitmap.pas
new file mode 100644
index 00000000..298dfc0a
--- /dev/null
+++ b/src/gui/fpg_style_bitmap.pas
@@ -0,0 +1,13 @@
+unit fpg_style_bitmap; 
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils; 
+
+implementation
+
+end.
+
diff --git a/src/gui/fpg_style_bluecurve.pas b/src/gui/fpg_style_bluecurve.pas
new file mode 100644
index 00000000..f3e029e1
--- /dev/null
+++ b/src/gui/fpg_style_bluecurve.pas
@@ -0,0 +1,13 @@
+unit fpg_style_bluecurve; 
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils; 
+
+implementation
+
+end.
+
diff --git a/src/gui/fpg_style_clearlooks.pas b/src/gui/fpg_style_clearlooks.pas
new file mode 100644
index 00000000..0236f95f
--- /dev/null
+++ b/src/gui/fpg_style_clearlooks.pas
@@ -0,0 +1,13 @@
+unit fpg_style_clearlooks; 
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils; 
+
+implementation
+
+end.
+
diff --git a/src/gui/fpg_style_motif.pas b/src/gui/fpg_style_motif.pas
new file mode 100644
index 00000000..5db89787
--- /dev/null
+++ b/src/gui/fpg_style_motif.pas
@@ -0,0 +1,20 @@
+unit fpg_style_motif; 
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils; 
+
+implementation
+
+uses
+  fpg_stylemanager
+  ;
+
+//initialization
+//  fpgStyleManager.RegisterClass('Motif', TfpgMotifStyle);
+
+end.
+
diff --git a/src/gui/fpg_style_win2k.pas b/src/gui/fpg_style_win2k.pas
new file mode 100644
index 00000000..70ae4e0f
--- /dev/null
+++ b/src/gui/fpg_style_win2k.pas
@@ -0,0 +1,30 @@
+unit fpg_style_win2k; 
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  fpg_main
+  ,fpg_style
+  ;
+
+type
+  TfpgWin2000Style = class(TfpgStyle)
+
+  end;
+
+implementation
+
+uses
+  fpg_stylemanager
+  ;
+
+
+initialization
+  fpgStyleManager.RegisterClass(cDefaultStyle, TfpgWin2000Style);   // TODO: This will change later
+  fpgStyleManager.RegisterClass('Win2000', TfpgWin2000Style);
+
+
+end.
+