X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FwxContourGUIExample%2FwxContourGUIExample.cxx;h=420a8941a80ee2620a13aca2d6a72550befbabfb;hb=a28ed40906998f6f376c2e4f68341a8df3cb5015;hp=72c91300216936db650430cdac00e7294f64370d;hpb=28671ae02163f2b674da599a98a128f58dfead88;p=creaContours.git diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx index 72c9130..420a894 100644 --- a/appli/wxContourGUIExample/wxContourGUIExample.cxx +++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx @@ -29,14 +29,9 @@ #include "wxContourGUIExample.h" #include "wxContourMainFrame.h" -//#include "OutlineModelManager.h" -//#include "wxContourEventHandler.h" -//#include -//#include #include #include #include -//#include "wxContourMainPanel.h" #include "vtkMetaImageReader.h" #include #include "vtkImageData.h" @@ -70,13 +65,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 +108,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"; @@ -147,9 +143,11 @@ bool wxTheApplication::OnInit() #if(WIN32) int main(int argc, char* argv[]) - { - return WinMain(::GetModuleHandle(NULL), NULL, - ::GetCommandLine(), SW_SHOWNORMAL); + { + char buffer[500]; + wcstombs(buffer, ::GetCommandLine(), 500); + return WinMain(::GetModuleHandle(NULL), NULL, buffer, SW_SHOWNORMAL); +// return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), SW_SHOWNORMAL); } #else #endif