From 6807fedd64a42da907c05d683eca9d3f63572cdd Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 9 Aug 2018 16:33:11 +0200 Subject: [PATCH] #3216 creaContours Feature New Normal - vtk8itk4wx3-mingw64 --- appli/wxContourGUIExample/wxContourGUIExample.cxx | 13 +++++++------ lib/Interface_Icons_NDimensions/interfMainPanel.cxx | 2 +- .../wxContourMainFrame.cxx | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx index 4c3a296..6809764 100644 --- a/appli/wxContourGUIExample/wxContourGUIExample.cxx +++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx @@ -70,13 +70,13 @@ wxContourGUIExample :: wxContourGUIExample(const wxString& title, const wxPoint& */ #ifdef _DEBUG -void wxAppConsole::OnAssert(char const *,int,char const *,char const *) -{ -} +//void wxAppConsole::OnAssert(char const *,int,char const *,char const *) +//{ +//} -void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,char const *) -{ -} +//void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,char const *) +//{ +//} #endif bool wxTheApplication::OnInit() @@ -113,6 +113,7 @@ bool wxTheApplication::OnInit() //JCP //std::string datadir( crea::wx2std(GetExecutablePath()) ); std::string datadir( crea::System::GetExecutablePath() ); + //JCP #ifdef LINUX /* assume this is OSX */ datadir=datadir+"/../share/creaContours"; diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx index 2931008..3f17f76 100644 --- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx +++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx @@ -136,7 +136,7 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH Connect(b4->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1); Connect(b5->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1); Connect(b6->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1); - this->Layout(); + this->Layout(); } interfMainPanel::~interfMainPanel(void) diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx index 548195c..764feea 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx @@ -135,10 +135,10 @@ char wxContourMainFrame::COPY = 'C'; void wxContourMainFrame::setVectImages(std::vector imgs) { _images = imgs; - #if defined(__GNUC__) - std::string str_home(getenv("HOME")); - #elif defined(_WIN32) + #if defined(_WIN32) std::string str_home(getenv("USERPROFILE")); + #elif defined(__GNUC__) + std::string str_home(getenv("HOME")); #endif std::string strCreaContourDataTmp = str_home + "/.creaContourDataTemp/"; std::vector conceptNameVect; -- 2.45.1