From: Stefan Csomor Date: Sat, 16 Aug 2003 16:46:23 +0000 (+0000) Subject: unicode for mac fixes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5f3f0f1725cc5e906caa6a81e368d0c8b29702ea unicode for mac fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index 185e81661f..da93fba635 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -222,7 +222,7 @@ bool wxDynamicLibrary::Load(wxString libname, int flags) #elif defined(HAVE_DLOPEN) || defined(__DARWIN__) #if defined(__VMS) || defined(__DARWIN__) - m_handle = dlopen(libname.c_str(), 0); // The second parameter is ignored + m_handle = dlopen(libname.fn_str(), 0); // The second parameter is ignored #else // !__VMS && !__DARWIN__ int rtldFlags = 0; diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 4f86e7bd16..991467af3c 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -977,7 +977,7 @@ wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) } // create path string for return value - wxString result( thePath ) ; + wxString result( thePath , wxConvLocal) ; #else Handle myPath ; short length ; diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index a3d49a8ae3..780fee8956 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -486,7 +486,7 @@ wxString wxGetOsDescription() { #ifdef WXWIN_OS_DESCRIPTION // use configure generated description if available - return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")"); + return wxString(wxT("MacOS (")) + wxT(WXWIN_OS_DESCRIPTION) + wxString(wxT(")")); #else return wxT("MacOS") ; //TODO:define further #endif diff --git a/src/mac/carbon/utilsexc.cpp b/src/mac/carbon/utilsexc.cpp index dc05dbab9c..e90ec86c08 100644 --- a/src/mac/carbon/utilsexc.cpp +++ b/src/mac/carbon/utilsexc.cpp @@ -44,12 +44,12 @@ long wxExecute(const wxString& command, int flags, wxProcess *handler) void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data) { wxEndProcessData *proc_data = (wxEndProcessData*)data; - wxLogDebug("Wow.. this actually worked!"); + wxLogDebug(wxT("Wow.. this actually worked!")); int status = 0; int rc = waitpid(abs(proc_data->pid), &status, WNOHANG); if(!rc) { - wxLogDebug("Mach port was invalidated, but process hasn't terminated!"); + wxLogDebug(wxT("Mach port was invalidated, but process hasn't terminated!")); return; } if((rc != -1) && WIFEXITED(status)) @@ -69,10 +69,10 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid) taskOfOurProcess = mach_task_self(); if(taskOfOurProcess == MACH_PORT_NULL) { - wxLogDebug("No mach_task_self()"); + wxLogDebug(wxT("No mach_task_self()")); return -1; } - wxLogDebug("pid=%d",pid); + wxLogDebug(wxT("pid=%d"),pid); kernResult = task_for_pid(taskOfOurProcess,pid, &machPortForProcess); if(kernResult != KERN_SUCCESS) { @@ -97,7 +97,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid) CFMachPortForProcess = CFMachPortCreateWithPort(NULL, machPortForProcess, NULL, &termcb_contextinfo, &ShouldFreePort); if(!CFMachPortForProcess) { - wxLogDebug("No CFMachPortForProcess"); + wxLogDebug(wxT("No CFMachPortForProcess")); mach_port_deallocate(taskOfOurProcess, machPortForProcess); return -1; } @@ -106,7 +106,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid) kernResult = mach_port_deallocate(taskOfOurProcess, machPortForProcess); if(kernResult!=KERN_SUCCESS) { - wxLogDebug("Couldn't deallocate mach port"); + wxLogDebug(wxT("Couldn't deallocate mach port")); return -1; } } @@ -115,7 +115,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid) runloopsource = CFMachPortCreateRunLoopSource(NULL,CFMachPortForProcess, (CFIndex)0); if(!runloopsource) { - wxLogDebug("Couldn't create runloopsource"); + wxLogDebug(wxT("Couldn't create runloopsource")); return -1; } @@ -123,7 +123,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid) CFRunLoopAddSource(CFRunLoopGetCurrent(),runloopsource,kCFRunLoopDefaultMode); CFRelease(runloopsource); - wxLogDebug("Successfully added notification to the runloop"); + wxLogDebug(wxT("Successfully added notification to the runloop")); return 0; } #endif diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp index a3d49a8ae3..780fee8956 100644 --- a/src/mac/utils.cpp +++ b/src/mac/utils.cpp @@ -486,7 +486,7 @@ wxString wxGetOsDescription() { #ifdef WXWIN_OS_DESCRIPTION // use configure generated description if available - return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")"); + return wxString(wxT("MacOS (")) + wxT(WXWIN_OS_DESCRIPTION) + wxString(wxT(")")); #else return wxT("MacOS") ; //TODO:define further #endif diff --git a/src/mac/utilsexc.cpp b/src/mac/utilsexc.cpp index dc05dbab9c..e90ec86c08 100644 --- a/src/mac/utilsexc.cpp +++ b/src/mac/utilsexc.cpp @@ -44,12 +44,12 @@ long wxExecute(const wxString& command, int flags, wxProcess *handler) void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data) { wxEndProcessData *proc_data = (wxEndProcessData*)data; - wxLogDebug("Wow.. this actually worked!"); + wxLogDebug(wxT("Wow.. this actually worked!")); int status = 0; int rc = waitpid(abs(proc_data->pid), &status, WNOHANG); if(!rc) { - wxLogDebug("Mach port was invalidated, but process hasn't terminated!"); + wxLogDebug(wxT("Mach port was invalidated, but process hasn't terminated!")); return; } if((rc != -1) && WIFEXITED(status)) @@ -69,10 +69,10 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid) taskOfOurProcess = mach_task_self(); if(taskOfOurProcess == MACH_PORT_NULL) { - wxLogDebug("No mach_task_self()"); + wxLogDebug(wxT("No mach_task_self()")); return -1; } - wxLogDebug("pid=%d",pid); + wxLogDebug(wxT("pid=%d"),pid); kernResult = task_for_pid(taskOfOurProcess,pid, &machPortForProcess); if(kernResult != KERN_SUCCESS) { @@ -97,7 +97,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid) CFMachPortForProcess = CFMachPortCreateWithPort(NULL, machPortForProcess, NULL, &termcb_contextinfo, &ShouldFreePort); if(!CFMachPortForProcess) { - wxLogDebug("No CFMachPortForProcess"); + wxLogDebug(wxT("No CFMachPortForProcess")); mach_port_deallocate(taskOfOurProcess, machPortForProcess); return -1; } @@ -106,7 +106,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid) kernResult = mach_port_deallocate(taskOfOurProcess, machPortForProcess); if(kernResult!=KERN_SUCCESS) { - wxLogDebug("Couldn't deallocate mach port"); + wxLogDebug(wxT("Couldn't deallocate mach port")); return -1; } } @@ -115,7 +115,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid) runloopsource = CFMachPortCreateRunLoopSource(NULL,CFMachPortForProcess, (CFIndex)0); if(!runloopsource) { - wxLogDebug("Couldn't create runloopsource"); + wxLogDebug(wxT("Couldn't create runloopsource")); return -1; } @@ -123,7 +123,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid) CFRunLoopAddSource(CFRunLoopGetCurrent(),runloopsource,kCFRunLoopDefaultMode); CFRelease(runloopsource); - wxLogDebug("Successfully added notification to the runloop"); + wxLogDebug(wxT("Successfully added notification to the runloop")); return 0; } #endif