creaButtonContainer: doxygen 90%

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracasRenderTabbedPanel.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index 88d9d4b65e9e8bcac9364a05ae5a774556801b53..fd6463b8b8b17a90615aac22737a93ad95912d55 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -116,12 +116,7 @@ void wxMaracasRenderTabbedPanel::createControls(vtkImageData* inImg, std::string
                        addSurface2(img, filename);
                        addSurface3(img, filename);     
                        addMPROptions();
-<<<<<<< wxMaracasRenderTabbedPanel.cpp
-//                     volname = (wxString) filename;
-                       volname = wxString(filename.c_str(),wxConvUTF8);
-=======
                        volname = crea::std2wx(filename);
->>>>>>> 1.16
                        wxtabs->Refresh();
                }
        }