Removed semicolons from end of DECLARE_DYNAMIC_CLASS() and DECLARE_NO_COPY_CLASS...

[wxWidgets.git] / include / wx / dynarray.h

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index f7782817b5fa0f1af1a404ba1c64728a8356a2cc..9a00c3a7bdc86aa2ff34aeec0a5d18ebdedade1b 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -69,10 +69,6 @@ public:
     /// assignment operator
   wxBaseArray& operator=(const wxBaseArray& src);
     /// not virtual, see above
-    /// EXCEPT for Gnu compiler to reduce warnings...
-#ifdef __GNUG__
- virtual
-#endif
   ~wxBaseArray();
   //@}
 
@@ -438,10 +434,27 @@ private:                                                            \
     typedef T _A##name;                                 \
     _WX_DEFINE_SORTED_ARRAY(_A##name, name, class WXDLLEXPORT)
 
+#define WX_DEFINE_EXPORTED_OBJARRAY(name)   WX_DEFINE_OBJARRAY(name)
 #define WX_DECLARE_EXPORTED_OBJARRAY(T, name)           \
     typedef T _L##name;                                 \
     _WX_DECLARE_OBJARRAY(_L##name, name, class WXDLLEXPORT)
 
+// ..and likewise these macros do very same thing as the ones above them too,
+// but allow the user to specify the export spec.  Needed if you have a dll
+// that wants to export a wxArray daubed with your own import/export goo.
+#define WX_DEFINE_USER_EXPORTED_ARRAY(T, name, usergoo)         \
+    typedef T _A##name;                                         \
+    _WX_DEFINE_ARRAY(_A##name, name, class usergoo)
+
+#define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(T, name, usergoo)  \
+    typedef T _A##name;                                         \
+    _WX_DEFINE_SORTED_ARRAY(_A##name, name, class usergoo)
+
+#define WX_DEFINE_USER_EXPORTED_OBJARRAY(name)   WX_DEFINE_OBJARRAY(name)
+#define WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, usergoo)     \
+    typedef T _L##name;                                         \
+    _WX_DECLARE_OBJARRAY(_L##name, name, class usergoo)
+
 // ----------------------------------------------------------------------------
 /** @name Some commonly used predefined arrays */
 // ----------------------------------------------------------------------------
@@ -458,7 +471,7 @@ WX_DEFINE_EXPORTED_ARRAY(void *, wxArrayPtrVoid);
 //@}
 
 // -----------------------------------------------------------------------------
-// convinience macros
+// convenience macros
 // -----------------------------------------------------------------------------
 
 // append all element of one array to another one