X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fview%2FbuttonContainerPanel.cxx;h=15d2c0ee76fc4bce9b87254302cf59ed3a255e65;hb=910aad6b5adef5024f896cc5a0daa79f1cda0661;hp=3265447de31e53d75e8c3703609f2918acda461b;hpb=978a6b69b838cd857d997d53e1392573853ae702;p=creaMaracasVisu.git

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 3265447..15d2c0e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/buttonContainerPanel.cxx
@@ -2,7 +2,7 @@
  * @file buttonGroup.cxx
  * @brief Implements the ButtonGroup class.
  * @author Diego CACERES (diego.caceres[AT]creatis.insa-lyon.fr)
- * @date  2011-05-24
+ * @date  2011-06-02
  */
 
 #include "buttonContainerPanel.h"
@@ -11,52 +11,50 @@ namespace creaButtonContainer
 {
 	namespace view
 	{
+		BEGIN_EVENT_TABLE(ButtonContainerPanel,wxScrolledWindow)
+		//(*EventTable(ButtonContainerPanel)
+		//*)
+		END_EVENT_TABLE()
+
 		// ----------------------------------------------------------------------------------
-		ButtonContainerPanel::ButtonContainerPanel( wxWindow* parent,
-		    ButtonGroupSettings* settings ) :
-			    wxScrolledWindow(
-			        parent,
-			        -1,
-			        wxDefaultPosition,
-			        wxSize( 400, 400 ),
-			        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 )
@@ -65,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 );