#3216 creaContours Feature New Normal - vtk8itk4wx3-mingw64

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 4c3a29628e0ffc4dd425b2c9347a1b60fc8fc8c5..680976430b23750464569d472ffacdc433109505 100644 (file)
--- 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 293100824fc8faa5a3d5b56397aa861c7e27a4fe..3f17f76490f9f79ed8a07c08aac7487e6f1e8d9b 100644 (file)
--- 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 548195cb526aaa76c34da97695a741f0980e1a7d..764feea43abd60fdcdf67f197c9b64f3aa5fbf94 100644 (file)
--- 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<vtkImageData*> 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<std::string> conceptNameVect;