X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaPanelButtonContainer%2FcreaPanelButtonContainer.cxx;h=93cf74cf778684ea7eace66fd37a82884c540e8f;hb=46fa5cac1a169b7c987bf954e7df39a8bceb1dc4;hp=b23fe4bfeae59092422ad45eb45128c44e3fdcfe;hpb=5bcbe43584902af3a90cfbd1a886a9c8434f236e;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 b23fe4b..93cf74c 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx @@ -103,7 +103,8 @@ namespace creaPanelButtonContainer TConcreteFunctor* lFunctor = new TConcreteFunctor(this, &PanelButtonContainer::GenericListEvent); - this->m_EventPanel = new wxPanel(this); + this->m_EmptyPanel = new wxPanel(this); + this->m_EventPanel = this->m_EmptyPanel; this->m_PanelUp = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _T("ListConfigContainerPanel")); @@ -242,14 +243,23 @@ namespace creaPanelButtonContainer std::cout << "Button Event" << std::endl; + this->m_EventPanel->Show(false); + this->m_ListConfigDialog->ShowModal(); //Show Dialog this->m_CurrentWxPanel->Reparent(this->m_PanelUp); this->m_CurrentWxPanel->Show(true); this->m_CurrentWxPanel->SetFunctorEnabled(true); + + this->m_CurrentWxPanel->GetListBox()->Deselect( + this->m_CurrentWxPanel->GetListBox()->GetSelection()); this->m_CurrentWxPanel->Update(); this->m_ListWxPanel->Show(false); this->m_EventPanel->Show(false); + this->m_EventPanel = this->m_EmptyPanel; + + this->m_AuiManager->GetPane(_T("EventPanel")).window = this->m_EventPanel; this->m_AuiManager->Update(); + } //End MLER // ----------------------------------------------------------------------------------