Added OLE automation sample, changed BC++ makefiles

[wxWidgets.git] / src / common / wxexpr.cpp

diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp
index 3d4979ef4c92b331799343b0399da1bb7d888392..39687462f17dbe00715dc01b70ba76d59d1a941f 100644 (file)
--- a/src/common/wxexpr.cpp
+++ b/src/common/wxexpr.cpp
@@ -42,11 +42,10 @@ extern "C" void add_expr(char *);
 extern "C" void LexFromFile(FILE *fd);
 extern "C" void LexFromString(char *buf);
 
 extern "C" void LexFromFile(FILE *fd);
 extern "C" void LexFromString(char *buf);
 

+

 wxExprDatabase *thewxExprDatabase = NULL;
 wxExprErrorHandler currentwxExprErrorHandler;
 
 wxExprDatabase *thewxExprDatabase = NULL;
 wxExprErrorHandler currentwxExprErrorHandler;
 

-IMPLEMENT_DYNAMIC_CLASS(wxExprDatabase, wxList)
-

 wxExpr::wxExpr(const wxString& functor)
 {
   type = wxExprList;
 wxExpr::wxExpr(const wxString& functor)
 {
   type = wxExprList;


@@ -851,7 +850,14 @@ void wxExpr::WriteLispExpr(ostream& stream)
   }
 }
 
   }
 }
 

-// wxExpr 'database' (list of expressions)
+/*
+ * wxExpr 'database' (list of expressions)
+ */
+ 
+#if !USE_SHARED_LIBRARIES
+IMPLEMENT_DYNAMIC_CLASS(wxExprDatabase, wxList)
+#endif
+

 wxExprDatabase::wxExprDatabase(wxExprErrorHandler handler)
 {
   position = NULL;
 wxExprDatabase::wxExprDatabase(wxExprErrorHandler handler)
 {
   position = NULL;