#3204 crea Feature New Normal branch mingw64

diff --git a/src/creaSystem.cxx b/src/creaSystem.cxx
index 3847f2bd2f55b44679fed78cfdfff5c5e16006a1..7966999a85a09bd20a10321cda879a546be4cd73 100644 (file)
--- a/src/creaSystem.cxx
+++ b/src/creaSystem.cxx
@@ -30,11 +30,6 @@
 #include <stdlib.h>
 #include <iostream>
 
-#ifdef WIN32
-       #include <windows.h> /* GetModuleFileName */
-       #include <io.h>
-       
-#endif /* WIN32 */
 
 #ifdef LINUX
        #include <sys/types.h>
@@ -78,6 +73,34 @@ namespace crea
    }
 #endif
 
+
+  
+#ifdef _WIN32
+  
+//=====================================================================================
+/*  http://forums.codeguru.com/showthread.php?336106-WCHAR*-to-CHAR*
+|| ::DESCRIPTION::
+|| This function will convert a WCHAR string to a CHAR string.
+||
+|| Param 1 :: Pointer to a buffer that will contain the converted string. Ensure this
+||            buffer is large enough; if not, buffer overrun errors will occur.
+|| Param 2 :: Constant pointer to a source WCHAR string to be converted to CHAR
+*/
+void System::wtoc(const WCHAR* Source,CHAR* Dest)
+{
+    int i = 0;
+    while(Source[i] != '\0')
+    {
+        Dest[i] = (CHAR)Source[i];
+        ++i;
+    } // while
+}
+
+
+#endif
+
+
+
 int System::GetAppPath(char *pname, size_t pathsize)
    {
 #ifdef LINUX   
@@ -101,8 +124,8 @@ int System::GetAppPath(char *pname, size_t pathsize)
 //2018-07-06 mingw64
     wchar_t pname2[512];
     long result = GetModuleFileName(NULL, pname2, pathsize);
+       crea::System::wtoc(pname2,pname);
 //    long result = GetModuleFileName(NULL, pname, pathsize);
-       int ret = wcstombs ( pname, pname2, sizeof(pname) );    
 
     if (result > 0)
        {
@@ -220,9 +243,8 @@ std::string System::GetDllAppPath(std::string &nomdll){
 //2018-07-06 mingw64
     wchar_t currentPath2[512];
        GetModuleFileName(hand, currentPath2, _MAX_PATH);
-       int ret = wcstombs ( currentPath, currentPath2, sizeof(currentPath) );  
+       crea::System::wtoc(currentPath2,currentPath);
 //     GetModuleFileName(hand, currentPath, _MAX_PATH);
-
        path = currentPath;
 
        path = path.substr(0,path.find_last_of("\\"));
@@ -245,17 +267,14 @@ std::string System::GetDllAppPath(const char *nomdll){
 //2018-07-06 mingw64
     wchar_t currentPath2[512];
        GetModuleFileName(hand, currentPath2, _MAX_PATH);
-       int ret = wcstombs ( currentPath, currentPath2, sizeof(currentPath) );  
+       crea::System::wtoc(currentPath2,currentPath);
 //     GetModuleFileName(hand, currentPath, _MAX_PATH);
-
        path = currentPath;
-
        path = path.substr(0,path.find_last_of("\\"));
 #endif
        return path;
 }
 
-
 #if defined(_WIN32)
 #define CREACONTOUR_VALID_FILE_SEPARATOR_CHAR '\\'
 #else
@@ -263,10 +282,12 @@ std::string System::GetDllAppPath(const char *nomdll){
 #endif 
        
        //=========================================================================
-std::string System::GetExecutablePath(){
+std::string System::GetExecutablePath()
+{
                char name[PATH_MAX];
                //EED    int err = get_app_path(name, PATH_MAX);
                int err = System::GetAppPath(name,PATH_MAX);
+printf("EED creaSystem::GetExecutablePath %s \n",name);
                if (err) 
                {
                        printf("Could not determine current executable path ?  ");  

diff --git a/src/creaSystem.h b/src/creaSystem.h
index 8fc1a34a8607763093b6d08e34f33ef4e4f809f0..34572ce9a3af225ce8b47e35ad38ff97cb1af78e 100644 (file)
--- a/src/creaSystem.h
+++ b/src/creaSystem.h
@@ -156,6 +156,11 @@
 // Version
 #include <string.h>
 
+#ifdef WIN32
+       #include <windows.h> /* GetModuleFileName */
+       #include <io.h>
+#endif /* WIN32 */
+
 namespace crea
 {
 #define CREA_STRINGIFY(A) #A
@@ -232,6 +237,9 @@ namespace crea
   {
     /// returns true iff the program has a tty
     static int HasTTY(); 
+#ifdef WIN32
+       CREA_EXPORT static void wtoc(const WCHAR* Source,CHAR* Dest);
+#endif /* WIN32 */
     CREA_EXPORT static int GetAppPath(char *pname, size_t pathsize);
     CREA_EXPORT static std::string GetDllAppPath(std::string &nomdll);
     CREA_EXPORT static std::string GetDllAppPath(const char *nomdll);   

diff --git a/src/creawxVTKRenderWindowInteractor.cxx b/src/creawxVTKRenderWindowInteractor.cxx
index a614f24a7054af42821706c89a1d887312c84448..62cd9da53b914773d592cfae26a6af5abf20e1c5 100644 (file)
--- a/src/creawxVTKRenderWindowInteractor.cxx
+++ b/src/creawxVTKRenderWindowInteractor.cxx
@@ -77,6 +77,7 @@
 #endif
 #endif
 
+
 //=======================================================================
 // LG : NAMESPACE IS NECESSARY TO AVOID CONFLICTING SYMBOLS IN DYN LIBS
 namespace crea
@@ -504,7 +505,11 @@ void wxVTKRenderWindowInteractor::OnPaint(wxPaintEvent& WXUNUSED(event))
   if(!Handle)
   {
     Handle = GetHandleHack();
+       
+       
     RenderWindow->SetWindowId(reinterpret_cast<void *>(Handle));
+               
+       
 // Cocoa
 // this->GetNSView() <-> DisplayId
 // this->GetTopLevel()->GetNSWindow() <-> WindowId