From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Thu, 19 Jan 2012 09:50:46 +0000 (+0000)
Subject: attempt for workaround for stl forward declaration problems
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/dd45d2848bafcf376a613c57fc043eaf5e5aa8c6

attempt for workaround for stl forward declaration problems

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/xtiprop.h b/include/wx/xtiprop.h
index ab04a57d15..11b33e3bd5 100644
--- a/include/wx/xtiprop.h
+++ b/include/wx/xtiprop.h
@@ -445,9 +445,20 @@ private:
     // when the component is dropped on the container.
 };
 
-WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxPropertyInfo*, wxPropertyInfoMap, 
+// stl is giving problems when forwarding declarations, therefore we define it as a subclass
+
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxPropertyInfo*, wxPropertyInfoMapBase, 
                                       class WXDLLIMPEXP_BASE );
 
+class WXDLLIMPEXP_BASE wxPropertyInfoMap : public wxPropertyInfoMapBase {
+};
+
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxAny, wxStringToAnyHashMapBase,
+                                     class WXDLLIMPEXP_BASE );
+
+class WXDLLIMPEXP_FWD_BASE wxStringToAnyHashMap : public wxStringToAnyHashMapBase {
+};
+
 #define wxBEGIN_PROPERTIES_TABLE(theClass)                      \
     wxPropertyInfo *theClass::GetPropertiesStatic()             \
     {                                                           \
@@ -546,8 +557,5 @@ public:                                                 \
   void  Set##name( type const & p) { m_##name = p; }    \
   type const & Get##name() const  { return m_##name; }
 
-WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxAny, wxStringToAnyHashMap,
-    class WXDLLIMPEXP_BASE );
-
 #endif      // wxUSE_EXTENDED_RTTI
 #endif      // _XTIPROP_H_