Added new dynamic loading classes. (which handle proper
wxRTTI and wxModule initialisation and unloading) Removed serialisation code from wxObject and elsewhere. Added USER_EXPORTED hash and list macros. Added *_PLUGGABLE_CLASS defines for exporting dynamic wxObjects from dlls. ---------------------------------------------------------------------- Modified Files: Makefile.in configure configure.in setup.h.in debian/changelog distrib/msw/tmake/filelist.txt include/wx/defs.h include/wx/docview.h include/wx/dynlib.h include/wx/fileconf.h include/wx/hash.h include/wx/list.h include/wx/module.h include/wx/object.h include/wx/resource.h include/wx/stream.h include/wx/gtk/setup0.h include/wx/msw/setup0.h src/files.lst src/wxBase.dsp src/wxUniv.dsp src/wxWindows.dsp src/common/dynlib.cpp src/common/filename.cpp src/common/module.cpp src/common/object.cpp src/common/stream.cpp src/gtk/files.lst src/mac/files.lst src/mgl/files.lst src/mgl/makefile.wat src/motif/files.lst src/msw/dialup.cpp src/msw/files.lst src/msw/helpchm.cpp src/msw/makefile.b32 src/msw/makefile.bcc src/msw/makefile.dos src/msw/makefile.g95 src/msw/makefile.sc src/msw/makefile.vc src/msw/makefile.wat src/os2/files.lst src/univ/files.lst Added Files: include/wx/dynload.h src/common/dynload.cpp Removed Files: include/wx/objstrm.h include/wx/serbase.h src/common/objstrm.cpp src/common/serbase.cpp utils/serialize/.cvsignore utils/serialize/makefile.b32 utils/serialize/sercore.cpp utils/serialize/sercore.h utils/serialize/serctrl.cpp utils/serialize/serctrl.h utils/serialize/serext.cpp utils/serialize/serext.h utils/serialize/sergdi.cpp utils/serialize/sergdi.h utils/serialize/sermain.cpp utils/serialize/serwnd.cpp utils/serialize/serwnd.h ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -44,11 +44,11 @@
|
||||
|
||||
#include "wx/msw/private.h" // must be before #include "dynlib.h"
|
||||
|
||||
#if !wxUSE_DYNLIB_CLASS
|
||||
#error You need wxUSE_DYNLIB_CLASS to be 1 to compile dialup.cpp.
|
||||
#endif
|
||||
|
||||
#if wxUSE_DYNAMIC_LOADER || wxUSE_DYNLIB_CLASS
|
||||
#include "wx/dynlib.h"
|
||||
#else
|
||||
#error You need wxUSE_DYNAMIC_LOADER to be 1 to compile dialup.cpp.
|
||||
#endif
|
||||
|
||||
#include "wx/dialup.h"
|
||||
|
||||
@@ -355,7 +355,7 @@ wxDialUpManagerMSW::wxDialUpManagerMSW()
|
||||
if ( !ms_nDllCount++ )
|
||||
{
|
||||
// load the RAS library
|
||||
ms_dllRas = wxDllLoader::LoadLibrary("RASAPI32");
|
||||
ms_dllRas = wxDllLoader::LoadLibrary(_T("RASAPI32"));
|
||||
if ( !ms_dllRas )
|
||||
{
|
||||
wxLogError(_("Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."));
|
||||
@@ -964,9 +964,8 @@ bool wxDialUpManagerMSW::IsAlwaysOnline() const
|
||||
}
|
||||
|
||||
// try to use WinInet function first
|
||||
bool ok;
|
||||
wxDllType hDll = wxDllLoader::LoadLibrary(_T("WININET"), &ok);
|
||||
if ( ok )
|
||||
wxDllType hDll = wxDllLoader::LoadLibrary(_T("WININET"));
|
||||
if ( hDll )
|
||||
{
|
||||
typedef BOOL (WINAPI *INTERNETGETCONNECTEDSTATE)(LPDWORD, DWORD);
|
||||
INTERNETGETCONNECTEDSTATE pfnInternetGetConnectedState;
|
||||
|
Reference in New Issue
Block a user