Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unicode for mac fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-08-16 16:46:23 +00:00
parent 69aa21acc9
commit 5f3f0f1725
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/dynlib.cpp
View File

@@ -222,7 +222,7 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
#elif defined(HAVE_DLOPEN) || defined(__DARWIN__) #elif defined(HAVE_DLOPEN) || defined(__DARWIN__)
#if defined(__VMS) || 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__ #else // !__VMS && !__DARWIN__
int rtldFlags = 0; int rtldFlags = 0;

2
src/common/filefn.cpp
View File

@@ -977,7 +977,7 @@ wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
} }
// create path string for return value // create path string for return value
wxString result( thePath ) ; wxString result( thePath , wxConvLocal) ;
#else #else
Handle myPath ; Handle myPath ;
short length ; short length ;

2
src/mac/carbon/utils.cpp
View File

@@ -486,7 +486,7 @@ wxString wxGetOsDescription()
{ {
#ifdef WXWIN_OS_DESCRIPTION #ifdef WXWIN_OS_DESCRIPTION
// use configure generated description if available // use configure generated description if available
return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")"); return wxString(wxT("MacOS (")) + wxT(WXWIN_OS_DESCRIPTION) + wxString(wxT(")"));
#else #else
return wxT("MacOS") ; //TODO:define further return wxT("MacOS") ; //TODO:define further
#endif #endif

16
src/mac/carbon/utilsexc.cpp
View File

@@ -44,12 +44,12 @@ long wxExecute(const wxString& command, int flags, wxProcess *handler)
void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data) void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data)
{ {
wxEndProcessData *proc_data = (wxEndProcessData*)data; wxEndProcessData *proc_data = (wxEndProcessData*)data;
wxLogDebug("Wow.. this actually worked!"); wxLogDebug(wxT("Wow.. this actually worked!"));
int status = 0; int status = 0;
int rc = waitpid(abs(proc_data->pid), &status, WNOHANG); int rc = waitpid(abs(proc_data->pid), &status, WNOHANG);
if(!rc) if(!rc)
{ {
wxLogDebug("Mach port was invalidated, but process hasn't terminated!"); wxLogDebug(wxT("Mach port was invalidated, but process hasn't terminated!"));
return; return;
} }
if((rc != -1) && WIFEXITED(status)) if((rc != -1) && WIFEXITED(status))
@@ -69,10 +69,10 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
taskOfOurProcess = mach_task_self(); taskOfOurProcess = mach_task_self();
if(taskOfOurProcess == MACH_PORT_NULL) if(taskOfOurProcess == MACH_PORT_NULL)
{ {
wxLogDebug("No mach_task_self()"); wxLogDebug(wxT("No mach_task_self()"));
return -1; return -1;
} }
wxLogDebug("pid=%d",pid); wxLogDebug(wxT("pid=%d"),pid);
kernResult = task_for_pid(taskOfOurProcess,pid, &machPortForProcess); kernResult = task_for_pid(taskOfOurProcess,pid, &machPortForProcess);
if(kernResult != KERN_SUCCESS) if(kernResult != KERN_SUCCESS)
{ {
@@ -97,7 +97,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
CFMachPortForProcess = CFMachPortCreateWithPort(NULL, machPortForProcess, NULL, &termcb_contextinfo, &ShouldFreePort); CFMachPortForProcess = CFMachPortCreateWithPort(NULL, machPortForProcess, NULL, &termcb_contextinfo, &ShouldFreePort);
if(!CFMachPortForProcess) if(!CFMachPortForProcess)
{ {
wxLogDebug("No CFMachPortForProcess"); wxLogDebug(wxT("No CFMachPortForProcess"));
mach_port_deallocate(taskOfOurProcess, machPortForProcess); mach_port_deallocate(taskOfOurProcess, machPortForProcess);
return -1; return -1;
} }
@@ -106,7 +106,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
kernResult = mach_port_deallocate(taskOfOurProcess, machPortForProcess); kernResult = mach_port_deallocate(taskOfOurProcess, machPortForProcess);
if(kernResult!=KERN_SUCCESS) if(kernResult!=KERN_SUCCESS)
{ {
wxLogDebug("Couldn't deallocate mach port"); wxLogDebug(wxT("Couldn't deallocate mach port"));
return -1; return -1;
} }
} }
@@ -115,7 +115,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
runloopsource = CFMachPortCreateRunLoopSource(NULL,CFMachPortForProcess, (CFIndex)0); runloopsource = CFMachPortCreateRunLoopSource(NULL,CFMachPortForProcess, (CFIndex)0);
if(!runloopsource) if(!runloopsource)
{ {
wxLogDebug("Couldn't create runloopsource"); wxLogDebug(wxT("Couldn't create runloopsource"));
return -1; return -1;
} }
@@ -123,7 +123,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
CFRunLoopAddSource(CFRunLoopGetCurrent(),runloopsource,kCFRunLoopDefaultMode); CFRunLoopAddSource(CFRunLoopGetCurrent(),runloopsource,kCFRunLoopDefaultMode);
CFRelease(runloopsource); CFRelease(runloopsource);
wxLogDebug("Successfully added notification to the runloop"); wxLogDebug(wxT("Successfully added notification to the runloop"));
return 0; return 0;
} }
#endif #endif

2
src/mac/utils.cpp
View File

@@ -486,7 +486,7 @@ wxString wxGetOsDescription()
{ {
#ifdef WXWIN_OS_DESCRIPTION #ifdef WXWIN_OS_DESCRIPTION
// use configure generated description if available // use configure generated description if available
return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")"); return wxString(wxT("MacOS (")) + wxT(WXWIN_OS_DESCRIPTION) + wxString(wxT(")"));
#else #else
return wxT("MacOS") ; //TODO:define further return wxT("MacOS") ; //TODO:define further
#endif #endif

16
src/mac/utilsexc.cpp
View File

@@ -44,12 +44,12 @@ long wxExecute(const wxString& command, int flags, wxProcess *handler)
void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data) void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data)
{ {
wxEndProcessData *proc_data = (wxEndProcessData*)data; wxEndProcessData *proc_data = (wxEndProcessData*)data;
wxLogDebug("Wow.. this actually worked!"); wxLogDebug(wxT("Wow.. this actually worked!"));
int status = 0; int status = 0;
int rc = waitpid(abs(proc_data->pid), &status, WNOHANG); int rc = waitpid(abs(proc_data->pid), &status, WNOHANG);
if(!rc) if(!rc)
{ {
wxLogDebug("Mach port was invalidated, but process hasn't terminated!"); wxLogDebug(wxT("Mach port was invalidated, but process hasn't terminated!"));
return; return;
} }
if((rc != -1) && WIFEXITED(status)) if((rc != -1) && WIFEXITED(status))
@@ -69,10 +69,10 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
taskOfOurProcess = mach_task_self(); taskOfOurProcess = mach_task_self();
if(taskOfOurProcess == MACH_PORT_NULL) if(taskOfOurProcess == MACH_PORT_NULL)
{ {
wxLogDebug("No mach_task_self()"); wxLogDebug(wxT("No mach_task_self()"));
return -1; return -1;
} }
wxLogDebug("pid=%d",pid); wxLogDebug(wxT("pid=%d"),pid);
kernResult = task_for_pid(taskOfOurProcess,pid, &machPortForProcess); kernResult = task_for_pid(taskOfOurProcess,pid, &machPortForProcess);
if(kernResult != KERN_SUCCESS) if(kernResult != KERN_SUCCESS)
{ {
@@ -97,7 +97,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
CFMachPortForProcess = CFMachPortCreateWithPort(NULL, machPortForProcess, NULL, &termcb_contextinfo, &ShouldFreePort); CFMachPortForProcess = CFMachPortCreateWithPort(NULL, machPortForProcess, NULL, &termcb_contextinfo, &ShouldFreePort);
if(!CFMachPortForProcess) if(!CFMachPortForProcess)
{ {
wxLogDebug("No CFMachPortForProcess"); wxLogDebug(wxT("No CFMachPortForProcess"));
mach_port_deallocate(taskOfOurProcess, machPortForProcess); mach_port_deallocate(taskOfOurProcess, machPortForProcess);
return -1; return -1;
} }
@@ -106,7 +106,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
kernResult = mach_port_deallocate(taskOfOurProcess, machPortForProcess); kernResult = mach_port_deallocate(taskOfOurProcess, machPortForProcess);
if(kernResult!=KERN_SUCCESS) if(kernResult!=KERN_SUCCESS)
{ {
wxLogDebug("Couldn't deallocate mach port"); wxLogDebug(wxT("Couldn't deallocate mach port"));
return -1; return -1;
} }
} }
@@ -115,7 +115,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
runloopsource = CFMachPortCreateRunLoopSource(NULL,CFMachPortForProcess, (CFIndex)0); runloopsource = CFMachPortCreateRunLoopSource(NULL,CFMachPortForProcess, (CFIndex)0);
if(!runloopsource) if(!runloopsource)
{ {
wxLogDebug("Couldn't create runloopsource"); wxLogDebug(wxT("Couldn't create runloopsource"));
return -1; return -1;
} }
@@ -123,7 +123,7 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
CFRunLoopAddSource(CFRunLoopGetCurrent(),runloopsource,kCFRunLoopDefaultMode); CFRunLoopAddSource(CFRunLoopGetCurrent(),runloopsource,kCFRunLoopDefaultMode);
CFRelease(runloopsource); CFRelease(runloopsource);
wxLogDebug("Successfully added notification to the runloop"); wxLogDebug(wxT("Successfully added notification to the runloop"));
return 0; return 0;
} }
#endif #endif