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

Corrected (maybe) the object.h token syntax; corrected typo in makefile.g95

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-01-04 14:18:59 +00:00
parent 44b62d54c6
commit abad53678b
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/msw/tmake/g95.t
View File

@@ -299,7 +299,7 @@ else
endif endif
#ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT)) #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 SETUP_H=$(ARCHINCDIR)/wx/setup.h

2
include/wx/msw/setup0.h
View File

@@ -360,7 +360,7 @@
#define wxUSE_DYNLIB_CLASS 1 #define wxUSE_DYNLIB_CLASS 1
// experimental, don't use for now // experimental, don't use for now
#define wxUSE_DYNAMIC_LOADER 0 #define wxUSE_DYNAMIC_LOADER 1
// Set to 1 to use socket classes // Set to 1 to use socket classes
#define wxUSE_SOCKETS 1 #define wxUSE_SOCKETS 1

2
include/wx/object.h
View File

@@ -211,7 +211,7 @@ name##PluginSentinel m_pluginsentinel;
wxPluginLibrary *e = (wxPluginLibrary*) wxPluginLibrary::ms_classes.Get(#name); \ wxPluginLibrary *e = (wxPluginLibrary*) wxPluginLibrary::ms_classes.Get(#name); \
if( e != 0 ) { e->RefObj(); } \ if( e != 0 ) { e->RefObj(); } \
} \ } \
name::name##PluginSentinel::~##name##PluginSentinel() { \ name::name##PluginSentinel::~name##PluginSentinel() { \
wxPluginLibrary *e = (wxPluginLibrary*) wxPluginLibrary::ms_classes.Get(#name); \ wxPluginLibrary *e = (wxPluginLibrary*) wxPluginLibrary::ms_classes.Get(#name); \
if( e != 0 ) { e->UnrefObj(); } \ if( e != 0 ) { e->UnrefObj(); } \
} }

2
src/msw/app.cpp
View File

@@ -252,9 +252,11 @@ bool wxApp::Initialize()
; ;
#endif // Win16 #endif // Win16
#if wxUSE_OLE
// we need to initialize OLE library // we need to initialize OLE library
if ( FAILED(::OleInitialize(NULL)) ) if ( FAILED(::OleInitialize(NULL)) )
wxLogError(_("Cannot initialize OLE")); wxLogError(_("Cannot initialize OLE"));
#endif
#endif // wxUSE_OLE #endif // wxUSE_OLE

2
src/msw/makefile.g95
View File

@@ -501,7 +501,7 @@ else
endif endif
#ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT)) #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 SETUP_H=$(ARCHINCDIR)/wx/setup.h