From 05710323ef76e7c0ea790133796044bafaa1e463 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Sun, 21 Sep 2014 11:51:26 +0000
Subject: [PATCH] LCL: Add new TComboBoxEx and TCheckComboBox components. Issue
 #26515, patch from Vojtech Cihak.

git-svn-id: trunk@46271 -
---
 images/components_images.res      | Bin 67611 -> 68783 bytes
 images/components_images_list.txt |   2 ++
 lcl/alllclunits.pp                |   2 +-
 lcl/comboex.pas                   |   1 -
 lcl/fpmake.pp                     |   2 ++
 lcl/lclbase.lpk                   |   6 +++++-
 lcl/registerlcl.pas               |   9 +++++----
 7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/images/components_images.res b/images/components_images.res
index 1b4c86b0e759c199781b41655aff3a4e4c27b276..50ceec2ff344a0225d3d789378012457d2bb6ada 100644
GIT binary patch
delta 1304
zcmV+z1?T#kkOZ%p1hCu<vJV^;1%m<r06dc+Bohfk08ao-073vylYwYHlYbls2?GEF
z00GOQPhgYa6CQuw2p$R)H~-R09smFW5J^NqR7l6QR!vJAK^T6fTMD&-Tzf1%`2i~%
zK_Q16T4;z@rMH$ssZ{Z>Imj4AT#*u%&^8TXPZrz$2g4qed=w!$tgt_zU#I?ngatw0
z9>Pp^cGrqD`<`Z>cV?cM_j&f+WkiIef-#0$NH`ehHA;Vy;5GnQ*319i$g&QUeL7ti
z^`o<4iL%)oI$ampY)($v-F>4h2xCE9L@JfS-LZS>4FKSMwTj1&ayUL|$)s(UQLj7j
zJQr(gB@|5)p64o<<2X1y9j@WLgmgL`B`BIEj!#-Bnx<UP>-Ch=ZEtTzN)yC7T^CRC
zg{a7y_9uT4fiEuZ4{i`<9YxfS&QO>)1_X1n8SLx~#G9HJ$KulkDd^VLW<=Dv*^FX@
z@Ek#)XdvntbcGN(pU<OGDMQx>8+)D$UC&5dh%WL$(Ivsu#CXJVL6PGG{uizgd^!Az
zmDOc%UV?3xvA_3mv~RNTuWgsXc}XT$R+q0Vi>`lXl(Gcz*GsQdn?8JSXXH2d{_}k3
zqUSH3;m5DvxV!`oKYhN|Mbr8u0H9KNEAwG@S=PbLT;w=TY)RtsBXdy@yUI<no4%`l
zkUc4`n~HJx5aI3`3C?Te`+aIO+oWlX8qGHOexH25PnyQaFlI>8m>i2|!<eD<^^MrE
z@Ao!|^BOgpZMso6z3xSeD^sGM%)-0@Mnq_~z9mM&lKyS^3(WI4`O+^N@&Et;07*qo
zM6N<$g0mYWX$%Fy0ssIslPxb914RH>lc6|02?GEF00GOQPhgYa6CQuw2p$R+1qCyB
z8~^|UPDw;TR7l6gmQQFCQ4q#|n-px^&>HALdeDO<2f;upBIM9R0xs#vi-(@Y&|?M5
zHYuekrIgZJ4mG5B6mQ}mNZ3QAX{Fc-iR?)wil?AZsFsE$Li;?#-R?`bL9xMs$9wzD
z+nIec-^^P@2tl_*Q51iCbXgQ#&xvk2=mE%P@BXu)Z1$04XM3kYsaQP@QEyYFH=qI#
zi;Vy<KffTo(2lurTY|wLf%B?-g5IVI7hv~kf*@d;6=JawOtV6%WMG;VCMVO}pO`p-
z8HT~u)`nwH*VFX(_sb4;UnLm$zDDre3jhud4m`s!J3HMG+unbva7#;`OtRnqwJQle
zJiORCLA%$pkW#Tqax@CMo)ebU5cNxM1huNLtcJ*BGSciG>*Y=9*=vtwHH5C`#CmyC
zpzAq7ttv>=1c{oktcLLW6%mbIcjl?7jI%xsckA5_dI0M2CeS4G;o7N5_DXOkTw>A7
z^gB{x;}C$t!#sca!YbpbduLb4sj+dV4*1rpgM48X)2tAQ48!l*h(w0bG>zruMIw=5
zN$<wpAE)SgPCU5zoPqcng(vwlW6|d?KV=r#gZO(fSbyv!`%l>9rI(Uy%ay%nuo9-e
zABNCzZviNk3^Yx{FbvPo936pS7ywf1kQ~(a!wmL)<Wqm>_Fu8d#=LaWg=1a5>KGr|
zQ;Gg4N*&bQN$s_}o6gNGc(bTohW1q6?!%3~J3xb_rA4QM+Or)tH^TsYKA4%A?(Cpt
z9BQFP$L{*yugv6V6h#O@dE<50oG9J?ZTSU{&a6lf0eNZw0000<MNUMnLSTXb002k=
O001-q006U$Fpt-YnrEB<

delta 265
zcmV+k0rvi{nFO1V1hCu<9rOSI05AXm0RR6A08{`%06_p!07C#s06_p!092DPA~%z;
zp$C7}mcI(ZFc8MSmOMxc`czI1PQ^J{oLuT^7vDx(-@sKN6~Wgyxgi9KaG*I#e(=GO
z;lBL4O9~=_CMA?HA#koEB%*D%1p-9Gg0)9V0p}SmJ%zjm6UOm@UwJ*>-?m7mu9ukN
z{T%|bft*aH6lOfnH9g%{tp5#~X2F`b(5g!Fo~2&N85mUS4J(5cWM^RH{=+dMaU2K4
z*!!Jekf8U-2C?Pp7&zDIodG{{*M1-*CjVc>2SXf&-al4o8vp<R07*qoM6N<$g0tKW
P92K*;C1?z@7&VvIw(oF6

diff --git a/images/components_images_list.txt b/images/components_images_list.txt
index f5b077be85..69ab896c5a 100644
--- a/images/components_images_list.txt
+++ b/images/components_images_list.txt
@@ -13,6 +13,7 @@ components/tcalculatordialog.png
 components/tcalendar.png
 components/tcalendardialog.png
 components/tcheckbox.png
+components/tcheckcombobox.png
 components/tcheckgroup.png
 components/tchecklistbox.png
 components/tcolorbox.png
@@ -20,6 +21,7 @@ components/tcolorbutton.png
 components/tcolordialog.png
 components/tcolorlistbox.png
 components/tcombobox.png
+components/tcomboboxex.png
 components/tcontrolbar.png
 components/tcoolbar.png
 components/tdatasource.png
diff --git a/lcl/alllclunits.pp b/lcl/alllclunits.pp
index 93b3e87241..ba8bae0194 100644
--- a/lcl/alllclunits.pp
+++ b/lcl/alllclunits.pp
@@ -26,7 +26,7 @@ uses
   ValEdit, lazcanvas, lazdialogs, lazregions, customdrawn_common, 
   customdrawncontrols, customdrawndrawers, lazdeviceapis, LDockTree, 
   LazFreeTypeIntfDrawer, customdrawn_winxp, customdrawn_android, Arrow, 
-  EditBtn, LazarusPackageIntf;
+  EditBtn, ComboEx, LazarusPackageIntf;
 
 implementation
 
diff --git a/lcl/comboex.pas b/lcl/comboex.pas
index e5812494e7..24eac1c996 100644
--- a/lcl/comboex.pas
+++ b/lcl/comboex.pas
@@ -386,7 +386,6 @@ implementation
 
 procedure Register;
 begin
-  {$I comboex.lrs}
   RegisterComponents('Misc', [TComboBoxEx, TCheckComboBox]);
 end;
 
diff --git a/lcl/fpmake.pp b/lcl/fpmake.pp
index 4643c7b3db..eb238d2d0b 100644
--- a/lcl/fpmake.pp
+++ b/lcl/fpmake.pp
@@ -151,6 +151,7 @@ begin
     t.Dependencies.AddUnit('calendar');
     t.Dependencies.AddUnit('registerlcl');
     t.Dependencies.AddUnit('valedit');
+    t.Dependencies.AddUnit('comboex');
     t.Dependencies.AddUnit('lazcanvas');
     t.Dependencies.AddUnit('lazdialogs');
     t.Dependencies.AddUnit('lazregions');
@@ -273,6 +274,7 @@ begin
     T:=P.Targets.AddUnit('calendar.pp');
     T:=P.Targets.AddUnit('registerlcl.pas');
     T:=P.Targets.AddUnit('valedit.pas');
+    T:=P.Targets.AddUnit('comboex.pas');
     T:=P.Targets.AddUnit('lazcanvas.pas');
     T:=P.Targets.AddUnit('lazdialogs.pas');
     T:=P.Targets.AddUnit('lazregions.pas');
diff --git a/lcl/lclbase.lpk b/lcl/lclbase.lpk
index 861ca975bf..fda076ba89 100644
--- a/lcl/lclbase.lpk
+++ b/lcl/lclbase.lpk
@@ -26,7 +26,7 @@
     <License Value="modified LGPL-2
 "/>
     <Version Major="1" Minor="3"/>
-    <Files Count="281">
+    <Files Count="282">
       <Item1>
         <Filename Value="checklst.pas"/>
         <UnitName Value="CheckLst"/>
@@ -1157,6 +1157,10 @@
         <HasRegisterProc Value="True"/>
         <UnitName Value="EditBtn"/>
       </Item281>
+      <Item282>
+        <Filename Value="comboex.pas"/>
+        <UnitName Value="ComboEx"/>
+      </Item282>
     </Files>
     <LazDoc Paths="../docs/xml/lcl"/>
     <i18n>
diff --git a/lcl/registerlcl.pas b/lcl/registerlcl.pas
index 3d16a294c4..efa0cc782a 100644
--- a/lcl/registerlcl.pas
+++ b/lcl/registerlcl.pas
@@ -15,7 +15,7 @@ uses
   PairSplitter, ExtDlgs, StdActns, DbCtrls, DBGrids, DBActns, EditBtn,
   ActnList, FileCtrl, Graphics, XMLPropStorage, IniPropStorage,
   ColorBox, ButtonPanel, LResources, LazHelpHTML, PopupNotifier, AsyncProcess,
-  UTF8Process, ShellCtrls, ValEdit;
+  UTF8Process, ShellCtrls, ValEdit, ComboEx;
 
 procedure Register;
 procedure RegisterLCLBase;
@@ -48,10 +48,10 @@ begin
   RegisterUnit('EditBtn',@EditBtn.Register);
   RegisterUnit('ActnList',@ActnList.Register);
   RegisterUnit('FileCtrl',@FileCtrl.Register);
+  RegisterUnit('ComboEx', @ComboEx.Register);
   RegisterUnit('Graphics',@Graphics.Register);
-  RegisterUnit('XMLPropStorage',@XMLPropStorage.Register);
-  RegisterUnit('IniPropStorage',@IniPropStorage.Register);
   RegisterUnit('ColorBox',@ColorBox.Register);
+  RegisterUnit('ValEdit', @ValEdit.Register);
   RegisterUnit('ButtonPanel',@ButtonPanel.Register);
   RegisterUnit('LResources',@LResources.Register);
   RegisterUnit('LazHelpHTML',@LazHelpHTML.Register);
@@ -59,7 +59,8 @@ begin
   RegisterUnit('AsyncProcess', @AsyncProcess.Register);
   RegisterUnit('UTF8Process', @UTF8Process.Register);
   RegisterUnit('ShellCtrls', @ShellCtrls.Register);
-  RegisterUnit('ValEdit', @ValEdit.Register);
+  RegisterUnit('XMLPropStorage',@XMLPropStorage.Register);
+  RegisterUnit('IniPropStorage',@IniPropStorage.Register);
 end;
 
 procedure RegisterLCLBase;