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

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index dd1f6ac7f935ce88b30dd9daa48c1261ed2f171e..9f693547d7a02bb43b323bd6abb2a6442841221e 100644 (file)
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -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
 

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index b27ec055debc413229b798116510e590de6222fe..be887d2a76e70daabe82897c2d9a8a8800c2dd8e 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.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

diff --git a/include/wx/object.h b/include/wx/object.h
index 43688968ab40ef3f0419af1ae64d146e8c60ccf3..6b529bd31e60f4795692a7a868c7cdd449fdd26a 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -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(); }                                 \
  }

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index ea3044497a6e7e2a2a8e71a856e0a9b27cbd5453..4bbbd7f651892c16ca29e84f111e0006f5cb2a9b 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -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
 

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 2be537ca2654380b74c442fdfa8b657b605b2899..f1a19ff5b9763fc96d39068173ab747acf338e5c 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -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