Tout le travail de documentation de la librairie creaMaracasVisu.Ils étaient ajouté...

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

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