no message

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / creaButtonContainer / view / buttonContainerPanel.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
index 93feebc7ec06c4079b986b78c0975ce28cc3cf62..15d2c0ee76fc4bce9b87254302cf59ed3a255e65 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
@@ -17,51 +17,44 @@ namespace creaButtonContainer
                END_EVENT_TABLE()
 
                // ----------------------------------------------------------------------------------
-               ButtonContainerPanel::ButtonContainerPanel( wxWindow* parent,
-                   ButtonGroupSettings* settings ) :
-                           wxScrolledWindow(
-                               parent,
-                               -1,
-                               wxDefaultPosition,
-                               wxDefaultSize,
-                               wxTAB_TRAVERSAL | wxVSCROLL | wxHSCROLL
-                                   | wxFULL_REPAINT_ON_RESIZE, _T("creaButtonContainer") )
+               ButtonContainerPanel::ButtonContainerPanel( wxWindow* parent, ButtonGroupSettings* settings ) 
+               : wxScrolledWindow(parent,-1, wxDefaultPosition,wxDefaultSize, wxTAB_TRAVERSAL | wxVSCROLL | wxHSCROLL | wxFULL_REPAINT_ON_RESIZE, _T("creaButtonContainer") )
                {
                        ButtonGroupFactory factory;
-                       this->SetGroupContainer(
-                           factory.CreateButtonGroupContainer( this, settings ) );
+                       this->SetGroupContainer( factory.CreateButtonGroupContainer( this, settings ) );
                        this->PanelInit( );
                        this->m_ButtonCController = new BCController( this );
                        this->m_ButtonCController->AddEvents( );
                        this->SetEventHandler( this->m_ButtonCController );
                }
+               
                // ----------------------------------------------------------------------------------
                ButtonContainerPanel::~ButtonContainerPanel( )
                {
                }
+               
                // ----------------------------------------------------------------------------------
-               void
-               ButtonContainerPanel::SetGroupContainer( ButtonGroupList groupContainer )
+               void ButtonContainerPanel::SetGroupContainer( ButtonGroupList groupContainer )
                {
                        this->m_ButtonGroupList = groupContainer;
                }
+               
                // ----------------------------------------------------------------------------------
-               void
-               ButtonContainerPanel::PanelInit( )
+               void ButtonContainerPanel::PanelInit( )
                {
                        try
                        {
+                               
+// EED 20/01/2012  flag 01
                                this->m_Sizer = new Sizer( 0, 1, 0, 0 );
-                               for( ButtonGroupList::iterator it = this->m_ButtonGroupList.begin( ); it
-                                   != this->m_ButtonGroupList.end( ); ++it )
+                               for( ButtonGroupList::iterator it = this->m_ButtonGroupList.begin( ); it != this->m_ButtonGroupList.end( ); ++it )
                                {
                                        GroupManager* manager = new GroupManager( this, *it );
                                        this->m_GroupManagerList[ manager->GetButtonID( ) ] = manager;
                                        this->m_Sizer->Add( manager, 1, wxALL | wxALIGN_LEFT | wxALIGN_TOP, 5 );
-                                       std::cout << "creaButtonContainer: New ButtonGroup Sizer Added"
-                                           << std::endl;
                                }
                                this->SetSizer( this->m_Sizer );
+                               this->Layout( );
                                this->FitSizer( );
                        }//yrt
                        catch ( const std::exception& e )
@@ -70,9 +63,9 @@ namespace creaButtonContainer
                                    << e.what( ) << std::endl;
                        }//hctac
                }
+               
                // ----------------------------------------------------------------------------------
-               void
-               ButtonContainerPanel::FitSizer( )
+               void ButtonContainerPanel::FitSizer( )
                {
                        this->m_Sizer->Fit( this );
                        this->m_Sizer->FitInside( this );