X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRenderTabbedPanel.cpp;h=fd6463b8b8b17a90615aac22737a93ad95912d55;hb=c1b7d6e874f1bfcac251e852ae37229c12c61656;hp=88d9d4b65e9e8bcac9364a05ae5a774556801b53;hpb=c1e89e18066d5e91ecb17dc0e27f8032feebdd12;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index 88d9d4b..fd6463b 100644
--- 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();
 		}
 	}