From 29ac45e15af78e7565693465053770e00e7b1a0d Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Thu, 21 Jan 2010 15:44:22 +0000 Subject: [PATCH] no message --- .../src/interface/wxWindows/widgets/OpenImageDialog.cxx | 5 ----- .../wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp | 5 ----- 2 files changed, 10 deletions(-) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx index 9d8ac51..88ebdd3 100644 --- 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 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(); } } -- 2.45.1