X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fmodel%2FbuttonGroupFactory.cxx;fp=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaButtonContainer%2Fmodel%2FbuttonGroupFactory.cxx;h=ab0af60cb3c1248b779044deaf6a9dc2c5a05b0f;hb=0cc1383dff9255c9929097bbe9f44a6f4f31c97a;hp=ccba053d156cdd2b3b8970d3f3b370ac4d56bba6;hpb=11899b8f7418abb4b95b70cd574d2de1c7f353ca;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx
index ccba053..ab0af60 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/model/buttonGroupFactory.cxx
@@ -19,10 +19,9 @@ namespace creaButtonContainer
 		ButtonGroupFactory::~ButtonGroupFactory( )
 		{
 		}
+		
 		// ----------------------------------------------------------------------------------
-		ButtonGroupFactory::ButtonGroupContainer
-		ButtonGroupFactory::CreateButtonGroupContainer( wxWindow* parent,
-		    ButtonGroupModel* settings )
+		ButtonGroupFactory::ButtonGroupContainer ButtonGroupFactory::CreateButtonGroupContainer( wxWindow* parent,  ButtonGroupModel* settings )
 		{
 			ButtonGroupContainer groupView;
 			try
@@ -31,11 +30,8 @@ namespace creaButtonContainer
 				for( ButtonGroupMap::iterator it = map.begin( ); it != map.end( ); ++it )
 				{
 					wxString groupNameAux( ( *it ).first.c_str( ), wxConvUTF8 );
-					wxStaticText* wxGroupName = new wxStaticText( parent, -1,
-					    groupNameAux, wxDefaultPosition, wxDefaultSize, 0,
-					    _T("GroupText") );
-					ButtonGroup* group = new ButtonGroup( wxGroupName,
-					    this->GetButtons( parent, ( *it ).second ) );
+					wxStaticText* wxGroupName = new wxStaticText( parent, -1, groupNameAux, wxDefaultPosition, wxDefaultSize, 0, _T("GroupText") );
+					ButtonGroup* group = new ButtonGroup( wxGroupName, this->GetButtons( parent, ( *it ).second ) );
 					groupView.push_back( group );
 				}//rof
 			}//yrt
@@ -47,9 +43,9 @@ namespace creaButtonContainer
 			}//chtac
 			return ( groupView );
 		}
+		
 		// ----------------------------------------------------------------------------------
-		ButtonGroupFactory::ButtonContainer
-		ButtonGroupFactory::GetButtons( wxWindow* parent, ButtonList buttonModel )
+		ButtonGroupFactory::ButtonContainer ButtonGroupFactory::GetButtons( wxWindow* parent, ButtonList buttonModel )
 		{
 			ButtonContainer buttonList;
 			try
@@ -68,7 +64,8 @@ namespace creaButtonContainer
 				    << "ButtonGroupFactory::GetButtons( wxWindow* parent, ButtonList buttonModel )"
 				    << "exception: " << e.what( ) << std::endl;
 			}//chtac
-		        return ( buttonList );	 // JPR
+			
+			return ( buttonList );	 // JPR
 		}
 	// ----------------------------------------------------------------------------------
 	}//ecapseman