It now compiles all these files without warnings in Unicode mode.

(at least It Works For Me(tm))
I will respond to any complaints when I wake up for another workday
(any complaints will prove whether Vadim was right in that it's bound
to break things)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-12 22:31:12 +00:00
parent 9d2f3c71d8
commit 509201463d
17 changed files with 891 additions and 861 deletions

View File

@@ -40,17 +40,17 @@
// ----------------------------------------------------------------------------
#if defined(HAVE_DLOPEN)
#define wxDllOpen(lib) dlopen(lib, RTLD_LAZY)
#define wxDllGetSymbol(handle, name) dlsym(handle, (char *)name)
#define wxDllOpen(lib) dlopen(lib.fn_str(), RTLD_LAZY)
#define wxDllGetSymbol(handle, name) dlsym(handle, name.mb_str())
#define wxDllClose dlclose
#elif defined(HAVE_SHL_LOAD)
#define wxDllOpen(lib) shl_load(lib, BIND_DEFERRED, 0)
#define wxDllOpen(lib) shl_load(lib.fn_str(), BIND_DEFERRED, 0)
#define wxDllClose shl_unload
static inline void *wxDllGetSymbol(shl_t handle, const char *name)
static inline void *wxDllGetSymbol(shl_t handle, const wxString& name)
{
void *sym;
if ( shl_findsym(&handle, name, TYPE_UNDEFINED, &sym) == 0 )
if ( shl_findsym(&handle, name.mb_str(), TYPE_UNDEFINED, &sym) == 0 )
return sym;
else
return (void *)0;
@@ -179,9 +179,7 @@ void *wxLibrary::GetSymbol(const wxString& symbname)
symbol = (void *)symAddress ;
}
#else
// VZ: hmm... why is WXSTRINGCAST needed? if it's really modified, we
// should make a copy of it
symbol = wxDllGetSymbol(m_handle, WXSTRINGCAST symbname);
symbol = wxDllGetSymbol(m_handle, symbname);
#endif
if ( !symbol )
@@ -234,7 +232,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
const char *envLibPath = getenv("LD_LIBRARY_PATH");
if ( envLibPath )
libPath << ':' << envLibPath;
wxStringTokenizer tokenizer(libPath, ':');
wxStringTokenizer tokenizer(libPath, _T(':'));
while ( tokenizer.HasMoreToken() )
{
wxString fullname(tokenizer.NextToken());