X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FcreaPanelButtonContainer%2FbuttonContainerSettings.cxx;h=721e82f1b7f70dbf7a6c65889140d172b9771e74;hb=412ca8c0300bc76e1a5e50a6de58840efc0d71b1;hp=e93c87a03fcc78994b6dda0b3a478429507dd985;hpb=e1c23d053ffe93035f13802efdb19dc116e4b46c;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
index e93c87a..721e82f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
@@ -91,6 +91,7 @@ namespace creaPanelButtonContainer
 		}//hctac
 		return ( NULL );
 	}
+/*
 	// ----------------------------------------------------------------------------------
 	ButtonContainerSettings::PanelButton
 	ButtonContainerSettings::GetPanelList( const StringType &buttonName )
@@ -118,7 +119,7 @@ namespace creaPanelButtonContainer
 		return (NULL);
 
 	}
-
+*/
 
 	// ----------------------------------------------------------------------------------
 	ButtonContainerSettings::ButtonGroupSettings*
@@ -269,8 +270,8 @@ namespace creaPanelButtonContainer
 			{
 				if( type == 0 )
 					this->AddButton( *it );
-				else if( type == 1 )
-					this->AddItems(*it);
+//				else if( type == 1 )
+//					this->AddItems(*it);
 			}//rof
 		}//yrt
 		catch ( std::exception& e )
@@ -324,22 +325,6 @@ namespace creaPanelButtonContainer
 			}//hctac
 		}
 */
-=======
-			std::cerr
-			<< "ButtonContainerSettings::AddButton( BCPSettingsStruct* info )"
-			<< "exception: " << e.what( ) << std::endl;
-			exit( 1 );
-		}//hctac
-	}
-
-	ButtonContainerSettings::ItemsMap
-	ButtonContainerSettings::GetItemsMap()
-	{
-		std::cout<< "MLER | ButtonContainerSettings:: GetItemsMap()" << std::endl;
-		return m_itemsMap;
-	}
-
->>>>>>> b8c5a565c70ac0def1f21518afa2d847a9582d79
 
 // ----------------------------------------------------------------------------------
 }//ecapseman