no message

diff --git a/appli/wxContourGUIExample/CMakeLists.txt b/appli/wxContourGUIExample/CMakeLists.txt
index 22137635a831f826960bb971952000094e86651e..9c488fbcc9b3ca70609ee335d3ed42d040c13d7b 100644 (file)
--- a/appli/wxContourGUIExample/CMakeLists.txt
+++ b/appli/wxContourGUIExample/CMakeLists.txt
@@ -10,6 +10,7 @@ ENDIF(WIN32)
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${creaImageIO2_INCLUDE_DIRS})
 
+
 TARGET_LINK_LIBRARIES( wxContourGUIExample
 #                     ${WXWIDGETS_LIBRARIES}
                       ${VTK_LIBRARIES}
@@ -19,7 +20,8 @@ TARGET_LINK_LIBRARIES( wxContourGUIExample
                       ${creaImageIO2_LIBRARIES}
                        Interface_Icons_NDimensions_lib
                        Interface_ManagerContour_NDimensions_lib
-                       kernel_ManagerContour_NDimensions_lib                   
+                       kernel_ManagerContour_NDimensions_lib
+                      ${BOOST_LIBRARIES}
 
                      )
 

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index a679b72b006ad4b39d67e0b248995fd494e6a0da..3b2b4231fcdf964bed0a69e20ff201f0780ce2d0 100644 (file)
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -20,6 +20,9 @@
 
 #include "wx/artprov.h"
 #include <wx/filedlg.h>
+
+
+/* EED EraseMe
 //#include "OutlineModelBuilder.h"
 //#include "ContourThing.h"
 //#include "AxeThing.h"
@@ -38,7 +41,8 @@
 #  define PATH_MAX MAXPATHLEN
 # endif
 #endif // MACOSX
-
+*/
+ 
 #ifndef PATH_MAX // If not defined yet : do it 
 #  define PATH_MAX 2048
 #endif
@@ -57,165 +61,8 @@ 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
-wxString GetExecutablePath()
-{
-    char buf[512];
-    char* slash;
 
-#if defined(WIN32)
-    GetModuleFileName(NULL, buf, 511);
-    slash = strrchr(buf, '\\');
-    if (slash)
-    {
-        *slash = 0;
-    }
-#elif defined(__LINUX__)
-    int res;
-    res = readlink("/proc/self/exe", buf, 512);
-    if (res == -1)
-        return _T("");
-    buf[res] = 0;
-    slash = strrchr(buf, '/');
-    if (slash)
-    {
-        *slash = 0;
-    }
-#else
-    return "";
-#endif
 
-    return wxString(buf, wxConvUTF8 );
-}
-*/
-
-//=========================================================================  
-// From http://www.fltk.org/newsgroups.php?gfltk.general+v:22083
-//
-int get_app_path (char *pname, size_t pathsize)
-{
-#ifdef LINUX   
-    /* Oddly, the readlink(2) man page says no NULL is appended. */
-    /* So you have to do it yourself, based on the return value: */
-    pathsize --; /* Preserve a space to add the trailing NULL */
-    long result = readlink("/proc/self/exe", pname, pathsize);
-    if (result > 0)
-       {
-               pname[result] = 0; /* add the #@!%ing NULL */
-               
-               if ((access(pname, 0) == 0))
-                       return 0; /* file exists, return OK */
-               /*else name doesn't seem to exist, return FAIL (falls
-                through) */
-       }
-#endif /* LINUX */
-    
-#ifdef WIN32
-    long result = GetModuleFileName(NULL, pname, pathsize);
-    if (result > 0)
-       {
-               /* fix up the dir slashes... */
-               int len = strlen(pname);
-               int idx;
-               for (idx = 0; idx < len; idx++)
-               {
-                       if (pname[idx] == '\\') pname[idx] = '/';
-               }
-               
-               for (idx = len-1; idx >=0 ; idx--)
-               {
-                       if (pname[idx] == '/')
-                       { 
-                               pname[idx+1] = '\0';
-                               idx = -1;
-                       }
-               }
-               
-               if ((access(pname, 0) == 0))
-                       return 0; /* file exists, return OK */
-               /*else name doesn't seem to exist, return FAIL (falls
-                through) */
-       }
-#endif /* WIN32 */
-    
-#ifdef SOLARIS
-    char *p = getexecname();
-    if (p)
-       {
-               /* According to the Sun manpages, getexecname will
-                "normally" return an */
-               /* absolute path - BUT might not... AND that IF it is not,
-                pre-pending */
-               /* getcwd() will "usually" be the correct thing... Urgh!
-                */
-               
-               /* check pathname is absolute (begins with a / ???) */
-               if (p[0] == '/') /* assume this means we have an
-                absolute path */
-               {
-                       strncpy(pname, p, pathsize);
-                       if ((access(pname, 0) == 0))
-                               return 0; /* file exists, return OK */
-               }
-               else /* if not, prepend getcwd() then check if file
-                exists */
-               {
-                       getcwd(pname, pathsize);
-                       long result = strlen(pname);
-                       strncat(pname, "/", (pathsize - result));
-                       result ++;
-                       strncat(pname, p, (pathsize - result));
-                       
-                       if ((access(pname, 0) == 0))
-                               return 0; /* file exists, return OK */
-                       /*else name doesn't seem to exist, return FAIL
-                        (falls through) */
-               }
-       }
-#endif /* SOLARIS */
-    
-#ifdef MACOSX /* assume this is OSX */
-    /*
-        from http://www.hmug.org/man/3/NSModule.html
-        
-        extern int _NSGetExecutablePath(char *buf, unsigned long
-        *bufsize);
-        
-        _NSGetExecutablePath  copies  the  path  of the executable
-        into the buffer and returns 0 if the path was successfully
-        copied  in the provided buffer. If the buffer is not large
-        enough, -1 is returned and the  expected  buffer  size  is
-        copied  in  *bufsize.  Note that _NSGetExecutablePath will
-        return "a path" to the executable not a "real path" to the
-        executable.  That  is  the path may be a symbolic link and
-        not the real file. And with  deep  directories  the  total
-        bufsize needed could be more than MAXPATHLEN.
-        */
-       
-    int status = -1;
-    char *given_path = (char*)malloc(MAXPATHLEN * 2);
-    if (!given_path) return status;
-    
-    uint32_t npathsize = MAXPATHLEN * 2;
-    long result = _NSGetExecutablePath(given_path, &npathsize);
-    if (result == 0)
-       { /* OK, we got something - now try and resolve the real path...
-        */
-               if (realpath(given_path, pname) != NULL)
-               {
-                       if ((access(pname, 0) == 0))
-                               status = 0; /* file exists, return OK */
-               }
-       }
-    free (given_path);
-    return status;
-#endif /* MACOSX */
-    
-    return -1; /* Path Lookup Failed */
-} 
-//=========================================================================
 
 #if defined(_WIN32)
 #define CREACONTOUR_VALID_FILE_SEPARATOR_CHAR '\\'
@@ -227,7 +74,8 @@ int get_app_path (char *pname, size_t pathsize)
 std::string GetExecutablePath()
 {
     char name[PATH_MAX];
-    int err = get_app_path(name, PATH_MAX);
+       //EED    int err = get_app_path(name, PATH_MAX);
+       int err = crea::System::GetAppPath(name,PATH_MAX);
     if (err) 
        {
                printf("Could not determine current executable path ?  ");