#2507 creaMaracasVisu Feature New Normal - creaPanelButtonContainer ListPanel

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / creaPanelButtonContainer / buttonContainerSettings.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
index cc82378b606649f6426f3264b20b7f52e1651da6..e93c87a03fcc78994b6dda0b3a478429507dd985 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
@@ -281,6 +281,9 @@ namespace creaPanelButtonContainer
                }//hctac
        }
 
+
+//EED-MLER
+/*
        void
        ButtonContainerSettings::AddItems(BCPSettingsStruct* info)
        {
@@ -304,6 +307,24 @@ namespace creaPanelButtonContainer
                }//yrt
                catch ( const std::exception& e )
                {
+<<<<<<< HEAD
+                       try
+                       {
+                               for( BCStructVectorType::iterator it = infoList.begin( ); it
+                                   != infoList.end( ); ++it )
+                               {
+                                       this->AddItem(*it);
+                               }//rof
+                       }//yrt
+                       catch ( const std::exception& e )
+                       {
+                               std::cerr
+                           << "ContainerSettings::AddButtons( BCStructVectorType infoList ) "
+                           << "exception: " << e.what( ) << std::endl;
+                       }//hctac
+               }
+*/
+=======
                        std::cerr
                        << "ButtonContainerSettings::AddButton( BCPSettingsStruct* info )"
                        << "exception: " << e.what( ) << std::endl;
@@ -318,6 +339,7 @@ namespace creaPanelButtonContainer
                return m_itemsMap;
        }
 
+>>>>>>> b8c5a565c70ac0def1f21518afa2d847a9582d79
 
 // ----------------------------------------------------------------------------------
 }//ecapseman