Use /bin/echo for creation of Mac OS X PkgInfo files.

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

diff --git a/include/wx/xtiprop.h b/include/wx/xtiprop.h
index ab04a57d1536fd5907d16967202d4fb41b780088..11b33e3bd56855bcbfea05fc0a14a4699f892ab4 100644 (file)
--- a/include/wx/xtiprop.h
+++ b/include/wx/xtiprop.h
@@ -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)                      \
     wxPropertyInfo *theClass::GetPropertiesStatic()             \
     {                                                           \
 #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; }
 
   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_
 #endif      // wxUSE_EXTENDED_RTTI
 #endif      // _XTIPROP_H_