no message

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
index 9d8ac5193a24788520d6f5353eaead108a86c3c5..88ebdd363493988a80a2a33ca16b8ad48f556e05 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
@@ -37,12 +37,7 @@ namespace creaMaracasVisuKernel{
 
                        if (FD->ShowModal()==wxID_OK)
                        {
-<<<<<<< OpenImageDialog.cxx
-//                             std::string  path= FD->GetPath();
-                               std::string  path= (const char*) (FD->GetPath().mb_str()); 
-=======
                                std::string  path= crea::wx2std(FD->GetPath());
->>>>>>> 1.2
 
                                vtkMetaImageReader *reader =  vtkMetaImageReader::New();
                                reader->SetFileName(path.c_str());

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();
                }
        }