AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

include wx/msw/wrapwin.h instead of entire private.h; unTABbed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2004-04-04 12:54:54 +00:00
parent 7c8c7cc23e
commit 5fccb5b4fd
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/common/dynlib.cpp
View File

@ -30,7 +30,7 @@
#if wxUSE_DYNLIB_CLASS
#if defined(__WINDOWS__)
#include "wx/msw/private.h"
#include "wx/msw/wrapwin.h"
#endif
#include "wx/dynlib.h"
@ -75,13 +75,13 @@ void TranslateError(const char *path, int number)
unsigned int index;
static char *OFIErrorStrings[] =
{
"%s(%d): Object Image Load Failure\n",
"%s(%d): Object Image Load Success\n",
"%s(%d): Not an recognisable object file\n",
"%s(%d): No valid architecture\n",
"%s(%d): Object image has an invalid format\n",
"%s(%d): Invalid access (permissions?)\n",
"%s(%d): Unknown error code from NSCreateObjectFileImageFromFile\n",
"%s(%d): Object Image Load Failure\n",
"%s(%d): Object Image Load Success\n",
"%s(%d): Not an recognisable object file\n",
"%s(%d): No valid architecture\n",
"%s(%d): Object image has an invalid format\n",
"%s(%d): Invalid access (permissions?)\n",
"%s(%d): Unknown error code from NSCreateObjectFileImageFromFile\n",
};
#define NUM_OFI_ERRORS (sizeof(OFIErrorStrings) / sizeof(OFIErrorStrings[0]))
@ -106,13 +106,13 @@ void *dlopen(const char *path, int WXUNUSED(mode) /* mode is ignored */)
dyld_result = NSCreateObjectFileImageFromFile(path, &ofile);
if (dyld_result != NSObjectFileImageSuccess)
{
TranslateError(path, dyld_result);
TranslateError(path, dyld_result);
}
else
{
// NSLinkModule will cause the run to abort on any link error's
// not very friendly but the error recovery functionality is limited.
handle = NSLinkModule(ofile, path, NSLINKMODULE_OPTION_BINDNOW);
// NSLinkModule will cause the run to abort on any link error's
// not very friendly but the error recovery functionality is limited.
handle = NSLinkModule(ofile, path, NSLINKMODULE_OPTION_BINDNOW);
}
return handle;
@ -127,16 +127,16 @@ int dlclose(void *handle)
void *dlsym(void *handle, const char *symbol)
{
void *addr;
NSSymbol nsSymbol = NSLookupSymbolInModule( handle , symbol ) ;
if ( nsSymbol)
if ( nsSymbol)
{
addr = NSAddressOfSymbol(nsSymbol);
addr = NSAddressOfSymbol(nsSymbol);
}
else
else
{
addr = NULL;
addr = NULL;
}
return addr;
}
@ -394,7 +394,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
return symbol;
}
/*static*/
wxString
@ -441,7 +441,7 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
{
wxAppTraits *traits = wxAppConsole::GetInstance() ?
wxAppConsole::GetInstance()->GetTraits() : NULL;
wxASSERT_MSG( traits,
wxASSERT_MSG( traits,
_("can't query for GUI plugins name in console applications") );
suffix = traits->GetToolkitInfo().shortName;
}
@ -490,7 +490,7 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
return CanonicalizeName(name + suffix, wxDL_MODULE);
}
/*static*/
wxString wxDynamicLibrary::GetPluginsDirectory()
{