X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FwxContourGUIExample%2FwxContourGUIExample.cxx;h=7b15059808fafcf320cf7534e537a08ba35268f3;hb=48f172ee7e9b077528376877269247ad3e517542;hp=190111890132816ee0a09fe6d22e10f56ead67c4;hpb=a609787b177c3ba7652e6e4f91cf348f9d7b036c;p=creaContours.git diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx index 1901118..7b15059 100644 --- a/appli/wxContourGUIExample/wxContourGUIExample.cxx +++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx @@ -2,13 +2,11 @@ // Class definition include //---------------------------------------------------------------------------------------------------------------- - #include "wxContourGUIExample.h" #include "wxContourMainFrame.h" //#include "OutlineModelManager.h" //#include "wxContourEventHandler.h" - #include #include @@ -28,12 +26,8 @@ //#include "SomeEnvironment.h" //#include "ReaderEnvironment.h" - - - //#include "interfMainPanel.h" - #if defined(MACOSX) // assume this is OSX # include # include // _NSGetExecutablePath : must add -framework CoreFoundation to link line @@ -45,19 +39,22 @@ #ifndef PATH_MAX // If not defined yet : do it # define PATH_MAX 2048 -#endif - +#endif +#if defined(WIN32) + #include +#else + #include +#endif +#include wxContourMainFrame* wxTheApplication::frame = 0; + //---------------------------------------------------------------------------------------------------------------- // This macro implements the entry point (main function) for the application //---------------------------------------------------------------------------------------------------------------- - - - /* //EED // http://lists.wxwidgets.org/archive/wx-dev/msg30449.html @@ -92,9 +89,6 @@ wxString GetExecutablePath() } */ - - - //========================================================================= // From http://www.fltk.org/newsgroups.php?gfltk.general+v:22083 // @@ -227,7 +221,6 @@ int get_app_path (char *pname, size_t pathsize) #define CREACONTOUR_VALID_FILE_SEPARATOR_CHAR '/' #endif - //========================================================================= std::string GetExecutablePath() { @@ -247,23 +240,14 @@ std::string GetExecutablePath() } return name; } -//========================================================================= - - - - - - - - +//========================================================================= +//========================================================================= IMPLEMENT_APP( wxTheApplication ); - /* wxContourGUIExample :: wxContourGUIExample(const wxString& title, const wxPoint& pos, const wxSize& size) : wxFrame((wxFrame *) NULL, -1, title, pos, size) { - } */ @@ -279,7 +263,6 @@ void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,ch bool wxTheApplication :: OnInit() { - wxInitAllImageHandlers(); int image_type = GIMMICK_3D_IMAGE_SELECTION; @@ -327,7 +310,6 @@ bool wxTheApplication :: OnInit() return -1; } - wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("ROI Application - Evaluation version, 09 Feb 2009 "), wxPoint(400,50), wxSize(800, 600) ); //frame = new wxContourMainFrame( frame1, wxID_ANY, wxString(_T("")), wxPoint(50,50), wxSize(800, 600), images );