From ec91601671ca568fa9136fd6a076aecb3e3bb3ed Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 23 Dec 2021 16:51:33 +0100 Subject: [PATCH] #3481 More inputs in wx ListCtrl box --- packages/wx/src/bbwxListCtrl.cxx | 31 +++++++------ packages/wx/src/bbwxListCtrl.h | 75 ++++++++++++++++++-------------- 2 files changed, 60 insertions(+), 46 deletions(-) diff --git a/packages/wx/src/bbwxListCtrl.cxx b/packages/wx/src/bbwxListCtrl.cxx index 9f06a83..5dcef49 100644 --- a/packages/wx/src/bbwxListCtrl.cxx +++ b/packages/wx/src/bbwxListCtrl.cxx @@ -28,20 +28,25 @@ void ListCtrl::Process() unsigned int j,jSize=bbGetInputColumn00().size(); for (j=0;jInsertItem(j, bbtk::std2wx("0") ); - lstctrl->SetItem(j,0, bbtk::std2wx( bbGetInputColumn00()[j] ) ); + lstctrl->InsertItem(j, bbtk::std2wx("0") ); + lstctrl->SetItem(j,0, bbtk::std2wx( bbGetInputColumn00()[j] ) ); - if ((bbGetInputColumn01().size()==jSize ) && (1SetItem(j,1, bbtk::std2wx( bbGetInputColumn01()[j] ) ); } - if ((bbGetInputColumn02().size()==jSize ) && (2SetItem(j,2, bbtk::std2wx( bbGetInputColumn02()[j] ) ); } - if ((bbGetInputColumn03().size()==jSize ) && (3SetItem(j,3, bbtk::std2wx( bbGetInputColumn03()[j] ) ); } - if ((bbGetInputColumn04().size()==jSize ) && (4SetItem(j,4, bbtk::std2wx( bbGetInputColumn04()[j] ) ); } - if ((bbGetInputColumn05().size()==jSize ) && (5SetItem(j,5, bbtk::std2wx( bbGetInputColumn05()[j] ) ); } - if ((bbGetInputColumn06().size()==jSize ) && (6SetItem(j,6, bbtk::std2wx( bbGetInputColumn06()[j] ) ); } - if ((bbGetInputColumn07().size()==jSize ) && (7SetItem(j,7, bbtk::std2wx( bbGetInputColumn07()[j] ) ); } - if ((bbGetInputColumn08().size()==jSize ) && (8SetItem(j,8, bbtk::std2wx( bbGetInputColumn08()[j] ) ); } - if ((bbGetInputColumn09().size()==jSize ) && (9SetItem(j,9, bbtk::std2wx( bbGetInputColumn09()[j] ) ); } - if ((bbGetInputColumn10().size()==jSize ) && (10SetItem(j,10,bbtk::std2wx( bbGetInputColumn10()[j] ) ); } - + if ((bbGetInputColumn01().size()==jSize ) && (1SetItem(j,1, bbtk::std2wx( bbGetInputColumn01()[j] ) ); } + if ((bbGetInputColumn02().size()==jSize ) && (2SetItem(j,2, bbtk::std2wx( bbGetInputColumn02()[j] ) ); } + if ((bbGetInputColumn03().size()==jSize ) && (3SetItem(j,3, bbtk::std2wx( bbGetInputColumn03()[j] ) ); } + if ((bbGetInputColumn04().size()==jSize ) && (4SetItem(j,4, bbtk::std2wx( bbGetInputColumn04()[j] ) ); } + if ((bbGetInputColumn05().size()==jSize ) && (5SetItem(j,5, bbtk::std2wx( bbGetInputColumn05()[j] ) ); } + if ((bbGetInputColumn06().size()==jSize ) && (6SetItem(j,6, bbtk::std2wx( bbGetInputColumn06()[j] ) ); } + if ((bbGetInputColumn07().size()==jSize ) && (7SetItem(j,7, bbtk::std2wx( bbGetInputColumn07()[j] ) ); } + if ((bbGetInputColumn08().size()==jSize ) && (8SetItem(j,8, bbtk::std2wx( bbGetInputColumn08()[j] ) ); } + if ((bbGetInputColumn09().size()==jSize ) && (9SetItem(j,9, bbtk::std2wx( bbGetInputColumn09()[j] ) ); } + if ((bbGetInputColumn10().size()==jSize ) && (10SetItem(j,10,bbtk::std2wx( bbGetInputColumn10()[j] ) ); } + if ((bbGetInputColumn11().size()==jSize ) && (10SetItem(j,11,bbtk::std2wx( bbGetInputColumn11()[j] ) ); } + if ((bbGetInputColumn12().size()==jSize ) && (10SetItem(j,12,bbtk::std2wx( bbGetInputColumn12()[j] ) ); } + if ((bbGetInputColumn13().size()==jSize ) && (10SetItem(j,13,bbtk::std2wx( bbGetInputColumn13()[j] ) ); } + if ((bbGetInputColumn14().size()==jSize ) && (10SetItem(j,14,bbtk::std2wx( bbGetInputColumn14()[j] ) ); } + if ((bbGetInputColumn15().size()==jSize ) && (10SetItem(j,15,bbtk::std2wx( bbGetInputColumn15()[j] ) ); } + } // for j diff --git a/packages/wx/src/bbwxListCtrl.h b/packages/wx/src/bbwxListCtrl.h index c606c65..c812c7d 100644 --- a/packages/wx/src/bbwxListCtrl.h +++ b/packages/wx/src/bbwxListCtrl.h @@ -19,46 +19,55 @@ class bbwx_EXPORT ListCtrl //===== // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) //===== - BBTK_DECLARE_INPUT(Titles,std::vector); - BBTK_DECLARE_INPUT(Column00,std::vector); - BBTK_DECLARE_INPUT(Column01,std::vector); - BBTK_DECLARE_INPUT(Column02,std::vector); - BBTK_DECLARE_INPUT(Column03,std::vector); - BBTK_DECLARE_INPUT(Column04,std::vector); - BBTK_DECLARE_INPUT(Column05,std::vector); - BBTK_DECLARE_INPUT(Column06,std::vector); - BBTK_DECLARE_INPUT(Column07,std::vector); - BBTK_DECLARE_INPUT(Column08,std::vector); - BBTK_DECLARE_INPUT(Column09,std::vector); - BBTK_DECLARE_INPUT(Column10,std::vector); - BBTK_PROCESS(Process); - void Process(); - BBTK_CREATE_WIDGET(CreateWidget); - void CreateWidget(wxWindow*); + BBTK_DECLARE_INPUT(Titles,std::vector); + BBTK_DECLARE_INPUT(Column00,std::vector); + BBTK_DECLARE_INPUT(Column01,std::vector); + BBTK_DECLARE_INPUT(Column02,std::vector); + BBTK_DECLARE_INPUT(Column03,std::vector); + BBTK_DECLARE_INPUT(Column04,std::vector); + BBTK_DECLARE_INPUT(Column05,std::vector); + BBTK_DECLARE_INPUT(Column06,std::vector); + BBTK_DECLARE_INPUT(Column07,std::vector); + BBTK_DECLARE_INPUT(Column08,std::vector); + BBTK_DECLARE_INPUT(Column09,std::vector); + BBTK_DECLARE_INPUT(Column10,std::vector); + BBTK_DECLARE_INPUT(Column11,std::vector); + BBTK_DECLARE_INPUT(Column12,std::vector); + BBTK_DECLARE_INPUT(Column13,std::vector); + BBTK_DECLARE_INPUT(Column14,std::vector); + BBTK_DECLARE_INPUT(Column15,std::vector); + BBTK_PROCESS(Process); + void Process(); + BBTK_CREATE_WIDGET(CreateWidget); + void CreateWidget(wxWindow*); //===== // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) //===== }; BBTK_BEGIN_DESCRIBE_BLACK_BOX(ListCtrl,bbtk::WxBlackBox); - BBTK_NAME("ListCtrl"); - BBTK_AUTHOR("InfoDev"); - BBTK_DESCRIPTION("No Description."); - BBTK_CATEGORY("__CategoryBlackBox__"); - - BBTK_INPUT(ListCtrl,Titles,"Titres",std::vector,""); - BBTK_INPUT(ListCtrl,Column00,"Column 0",std::vector,""); - BBTK_INPUT(ListCtrl,Column01,"Column 1",std::vector,""); - BBTK_INPUT(ListCtrl,Column02,"Column 2",std::vector,""); - BBTK_INPUT(ListCtrl,Column03,"Column 3",std::vector,""); - BBTK_INPUT(ListCtrl,Column04,"Column 4",std::vector,""); - BBTK_INPUT(ListCtrl,Column05,"Column 5",std::vector,""); - BBTK_INPUT(ListCtrl,Column06,"Column 6",std::vector,""); - BBTK_INPUT(ListCtrl,Column07,"Column 7",std::vector,""); - BBTK_INPUT(ListCtrl,Column08,"Column 8",std::vector,""); - BBTK_INPUT(ListCtrl,Column09,"Column 9",std::vector,""); - BBTK_INPUT(ListCtrl,Column10,"Column 10",std::vector,""); + BBTK_NAME("ListCtrl"); + BBTK_AUTHOR("InfoDev"); + BBTK_DESCRIPTION("No Description."); + BBTK_CATEGORY("__CategoryBlackBox__"); + BBTK_INPUT(ListCtrl,Titles,"Titres",std::vector,""); + BBTK_INPUT(ListCtrl,Column00,"Column 0",std::vector,""); + BBTK_INPUT(ListCtrl,Column01,"Column 1",std::vector,""); + BBTK_INPUT(ListCtrl,Column02,"Column 2",std::vector,""); + BBTK_INPUT(ListCtrl,Column03,"Column 3",std::vector,""); + BBTK_INPUT(ListCtrl,Column04,"Column 4",std::vector,""); + BBTK_INPUT(ListCtrl,Column05,"Column 5",std::vector,""); + BBTK_INPUT(ListCtrl,Column06,"Column 6",std::vector,""); + BBTK_INPUT(ListCtrl,Column07,"Column 7",std::vector,""); + BBTK_INPUT(ListCtrl,Column08,"Column 8",std::vector,""); + BBTK_INPUT(ListCtrl,Column09,"Column 9",std::vector,""); + BBTK_INPUT(ListCtrl,Column10,"Column 10",std::vector,""); + BBTK_INPUT(ListCtrl,Column11,"Column 11",std::vector,""); + BBTK_INPUT(ListCtrl,Column12,"Column 12",std::vector,""); + BBTK_INPUT(ListCtrl,Column13,"Column 13",std::vector,""); + BBTK_INPUT(ListCtrl,Column14,"Column 14",std::vector,""); + BBTK_INPUT(ListCtrl,Column15,"Column 15",std::vector,""); BBTK_END_DESCRIBE_BLACK_BOX(ListCtrl); //===== -- 2.47.1