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

attempt for workaround for stl forward declaration problems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-01-19 09:50:46 +00:00
parent eb5159969d
commit dd45d2848b
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/xtiprop.h
View File

@@ -445,9 +445,20 @@ private:
// when the component is dropped on the container. // 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 );
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) \ #define wxBEGIN_PROPERTIES_TABLE(theClass) \
wxPropertyInfo *theClass::GetPropertiesStatic() \ wxPropertyInfo *theClass::GetPropertiesStatic() \
{ \ { \
@@ -546,8 +557,5 @@ public: \
void Set##name( type const & p) { m_##name = p; } \ void Set##name( type const & p) { m_##name = p; } \
type const & Get##name() const { return m_##name; } 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 // wxUSE_EXTENDED_RTTI
#endif // _XTIPROP_H_ #endif // _XTIPROP_H_