X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaPanelButtonContainer%2FcreaPanelButtonContainer.cxx;h=2cd26add7a968c39bede4cc54a92657de197228e;hb=bbd33bbb0f352d14d7068d87fcd50e02341004a9;hp=c69fe01141febae79773729e7ff1a541762d339c;hpb=dd348ad5863434fb9cfe0b74c20777ad5fc4ef8f;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx
index c69fe01..2cd26ad 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx
@@ -79,32 +79,12 @@ namespace creaPanelButtonContainer
 			this->m_ListPanel = new wxPanel(this);
 			std::cout << "tipo 1; new LIstWx"<<std::endl;
 			this->mylist = new ListWx(this, -1,this->m_ButtonContainerSettings->GetItemsMap(), lFunctor);
-
+			mylist->FillList();
 			this->m_AuiManager->AddPane( this->mylist,wxAuiPaneInfo( ).Name( _T("ListContainerPanel") ).Caption(_("ListContainerPanel") ). CaptionVisible( true ).CloseButton(false ).Center( ).Resizable( true ) );
 			this->m_AuiManager->AddPane(this->m_ListPanel, wxAuiPaneInfo( ).Name( _T("ListPanel") ).Caption( _("ListPanel") ). CaptionVisible(true ).CloseButton( false ).Bottom( ).Resizable( true ) );
 		}
 		else if( type == 2)
 		{
-			/*this->m_ListPanel = new wxPanel(this);
-			std::cout << "tipo 2; new LIstWx"<<std::endl;
-			this->mylist = new ListWx(this, -1,this->m_ButtonContainerSettings->GetItemsMap(), lFunctor);
-			this->mylist->Show(false);
-			ItemsMap empty;
-			this->myConfiglist = new ListWx(this,-1, empty,lFunctor);
-			//wxButton
-			wxPanel* panelButton = new wxPanel(this);
-			wxBoxSizer* buttonSizer = new wxBoxSizer(wxHORIZONTAL);
-			button = new wxButton(panelButton, -1, _("Configurar"),
-						wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Configurar"));
-			buttonSizer->Add(button,0,wxEXPAND);
-			panelButton->SetSizer(buttonSizer);
-
-			this->m_AuiManager->AddPane( panelButton,wxAuiPaneInfo( ).Name( _T("ListConfigContainerPanel") ).Caption(_("ListConfigContainerPanel") ). CaptionVisible( true ).CloseButton(false ).Center( ).Resizable( true ) );
-
-			this->m_AuiManager->AddPane( this->myConfiglist,wxAuiPaneInfo( ).Name( _T("ListContainerPanel") ).Caption(_("ListContainerPanel") ). CaptionVisible( true ).CloseButton(false ).Center( ).Resizable( true ) );
-
-			this->m_AuiManager->AddPane(this->m_ListPanel, wxAuiPaneInfo( ).Name( _T("ListPanel") ).Caption( _("ListPanel") ). CaptionVisible(true ).CloseButton( false ).Bottom( ).Resizable( true ) );
-	*/
 
 			this->m_ListPanel = new wxPanel(this);
 
@@ -135,9 +115,10 @@ namespace creaPanelButtonContainer
 			panelUp->SetSizer(mainSizer);
 
 			this->m_AuiManager->AddPane( panelUp,wxAuiPaneInfo( ).Name( _T("ListConfigContainerPanel") ).Caption(_("ListConfigContainerPanel") ). CaptionVisible( true ).CloseButton(false ).Center( ).Resizable( true ) );
-			this->m_AuiManager->AddPane(this->m_ListPanel, wxAuiPaneInfo( ).Name( _T("ListConfigPanel") ).Caption( _("ListConfigPanel") ). CaptionVisible(true ).CloseButton( false ).Bottom( ).Resizable( true ) );
+			this->m_AuiManager->AddPane(this->m_ListPanel, wxAuiPaneInfo( ).Name( _T("ListPanel") ).Caption( _("ListPanel") ). CaptionVisible(true ).CloseButton( false ).Bottom( ).Resizable( true ) );
 		}
 
+
 		//MLER
 
 		this->m_AuiManager->Update( );
@@ -240,14 +221,13 @@ namespace creaPanelButtonContainer
 
 		std::cout<< "BUtton Event"<<std::endl;
 
-		if ( m_listConfigPanel->ShowModal() == 1 )
-		{
-			this->myConfiglist->Reparent(panelUp);
-			this->myConfiglist->Show(true);
-			this->myConfiglist->SetFunctorEnabled(true);
-			this->panelUp->Update();
-			this->m_AuiManager->Update( );
-		}
+		m_listConfigPanel->ShowModal();
+		this->myConfiglist->Reparent(panelUp);
+		this->myConfiglist->Show(true);
+		this->myConfiglist->SetFunctorEnabled(true);
+		this->myConfiglist->Update();
+		this->m_AuiManager->Update( );
+		this->m_ListPanel->Show(false);
 	}