Corrected (maybe) the object.h token syntax; corrected typo in makefile.g95
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
44b62d54c6
commit
abad53678b
@ -299,7 +299,7 @@ else
|
||||
endif
|
||||
|
||||
#ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))
|
||||
ARCHINCDIR=(WXDIR)/lib/msw$(INCEXT)
|
||||
ARCHINCDIR=$(WXDIR)/lib/msw$(INCEXT)
|
||||
|
||||
SETUP_H=$(ARCHINCDIR)/wx/setup.h
|
||||
|
||||
|
@ -360,7 +360,7 @@
|
||||
#define wxUSE_DYNLIB_CLASS 1
|
||||
|
||||
// experimental, don't use for now
|
||||
#define wxUSE_DYNAMIC_LOADER 0
|
||||
#define wxUSE_DYNAMIC_LOADER 1
|
||||
|
||||
// Set to 1 to use socket classes
|
||||
#define wxUSE_SOCKETS 1
|
||||
|
@ -211,7 +211,7 @@ name##PluginSentinel m_pluginsentinel;
|
||||
wxPluginLibrary *e = (wxPluginLibrary*) wxPluginLibrary::ms_classes.Get(#name); \
|
||||
if( e != 0 ) { e->RefObj(); } \
|
||||
} \
|
||||
name::name##PluginSentinel::~##name##PluginSentinel() { \
|
||||
name::name##PluginSentinel::~name##PluginSentinel() { \
|
||||
wxPluginLibrary *e = (wxPluginLibrary*) wxPluginLibrary::ms_classes.Get(#name); \
|
||||
if( e != 0 ) { e->UnrefObj(); } \
|
||||
}
|
||||
|
@ -252,9 +252,11 @@ bool wxApp::Initialize()
|
||||
;
|
||||
#endif // Win16
|
||||
|
||||
#if wxUSE_OLE
|
||||
// we need to initialize OLE library
|
||||
if ( FAILED(::OleInitialize(NULL)) )
|
||||
wxLogError(_("Cannot initialize OLE"));
|
||||
#endif
|
||||
|
||||
#endif // wxUSE_OLE
|
||||
|
||||
|
@ -501,7 +501,7 @@ else
|
||||
endif
|
||||
|
||||
#ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))
|
||||
ARCHINCDIR=(WXDIR)/lib/msw$(INCEXT)
|
||||
ARCHINCDIR=$(WXDIR)/lib/msw$(INCEXT)
|
||||
|
||||
SETUP_H=$(ARCHINCDIR)/wx/setup.h
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user