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

corrected Unicode conversion when replacing shared library extension with ".rsrc"

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2003-12-07 21:11:49 +00:00
parent b60c6e9776
commit bc93670d3b
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mac/app.cpp
View File

@@ -811,7 +811,11 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
// allocate copy to replace .dylib.* extension with .rsrc // allocate copy to replace .dylib.* extension with .rsrc
if (theLibPath != NULL) { if (theLibPath != NULL) {
theResPath = theLibPath; #if wxUSE_UNICODE
theResPath = wxString(theLibPath, wxConvLocal);
#else
theResPath = wxString(theLibPath);
#endif
// replace '_core' with '' in case of multi-lib build // replace '_core' with '' in case of multi-lib build
theResPath.Replace(wxT("_core"), wxEmptyString); theResPath.Replace(wxT("_core"), wxEmptyString);
// replace ".dylib" shared library extension with ".rsrc" // replace ".dylib" shared library extension with ".rsrc"
@@ -837,8 +841,7 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
} }
if (theErr != noErr) { if (theErr != noErr) {
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
fprintf(stderr, wxLogDebug( wxT("unable to open wxMac resource file '%s'\n"),
wxT("unable to open wxMac resource file '%s'\n"),
theResPath.mb_str() ); theResPath.mb_str() );
#endif // __WXDEBUG__ #endif // __WXDEBUG__
} }

9
src/mac/carbon/app.cpp
View File

@@ -811,7 +811,11 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
// allocate copy to replace .dylib.* extension with .rsrc // allocate copy to replace .dylib.* extension with .rsrc
if (theLibPath != NULL) { if (theLibPath != NULL) {
theResPath = theLibPath; #if wxUSE_UNICODE
theResPath = wxString(theLibPath, wxConvLocal);
#else
theResPath = wxString(theLibPath);
#endif
// replace '_core' with '' in case of multi-lib build // replace '_core' with '' in case of multi-lib build
theResPath.Replace(wxT("_core"), wxEmptyString); theResPath.Replace(wxT("_core"), wxEmptyString);
// replace ".dylib" shared library extension with ".rsrc" // replace ".dylib" shared library extension with ".rsrc"
@@ -837,8 +841,7 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
} }
if (theErr != noErr) { if (theErr != noErr) {
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
fprintf(stderr, wxLogDebug( wxT("unable to open wxMac resource file '%s'\n"),
wxT("unable to open wxMac resource file '%s'\n"),
theResPath.mb_str() ); theResPath.mb_str() );
#endif // __WXDEBUG__ #endif // __WXDEBUG__
} }