CW8.3+ has ssize_t (patch 1492413)

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

diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index 33908648573d3e5c7598eaa44b7dcb6b4dab823e..33fae4c1045b668ea092b765675f92a59410c819 100644 (file)
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -16,8 +16,6 @@
 #include "wx/string.h"
 #include "wx/hashmap.h"
 
 #include "wx/string.h"
 #include "wx/hashmap.h"
 

-#if wxABI_VERSION >= 20602
-

 typedef int (*wxShadowObjectMethod)(void*, void*);
 WX_DECLARE_STRING_HASH_MAP_WITH_DECL(
     wxShadowObjectMethod,
 typedef int (*wxShadowObjectMethod)(void*, void*);
 WX_DECLARE_STRING_HASH_MAP_WITH_DECL(
     wxShadowObjectMethod,


@@ -34,18 +32,18 @@ class WXDLLIMPEXP_BASE wxShadowObject
 {
 public:
     wxShadowObject() { }
 {
 public:
     wxShadowObject() { }

-    
+

     void AddMethod( const wxString &name, wxShadowObjectMethod method )
     void AddMethod( const wxString &name, wxShadowObjectMethod method )

-    { 
+    {

         wxShadowObjectMethods::iterator it = m_methods.find( name );
         if (it == m_methods.end())
             m_methods[ name ] = method;
         else
             it->second = method;
     }
         wxShadowObjectMethods::iterator it = m_methods.find( name );
         if (it == m_methods.end())
             m_methods[ name ] = method;
         else
             it->second = method;
     }

-    
+

     bool InvokeMethod( const wxString &name, void* window, void* param, int* returnValue )
     bool InvokeMethod( const wxString &name, void* window, void* param, int* returnValue )

-    { 
+    {

         wxShadowObjectMethods::iterator it = m_methods.find( name );
         if (it == m_methods.end())
             return false;
         wxShadowObjectMethods::iterator it = m_methods.find( name );
         if (it == m_methods.end())
             return false;


@@ -55,7 +53,7 @@ public:
             *returnValue = ret;
         return true;
     }
             *returnValue = ret;
         return true;
     }

-    
+

     void AddField( const wxString &name, void* initialValue = NULL )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );
     void AddField( const wxString &name, void* initialValue = NULL )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );


@@ -64,7 +62,7 @@ public:
         else
             it->second = initialValue;
     }
         else
             it->second = initialValue;
     }

-    
+

     void SetField( const wxString &name, void* value )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );
     void SetField( const wxString &name, void* value )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );


@@ -72,7 +70,7 @@ public:
             return;
         it->second = value;
     }
             return;
         it->second = value;
     }

-    
+

     void* GetField( const wxString &name, void *defaultValue = NULL )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );
     void* GetField( const wxString &name, void *defaultValue = NULL )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );


@@ -80,13 +78,12 @@ public:
             return defaultValue;
         return it->second;
     }
             return defaultValue;
         return it->second;
     }

-    
+

 private:
     wxShadowObjectMethods   m_methods;
     wxShadowObjectFields    m_fields;
 };
 
 private:
     wxShadowObjectMethods   m_methods;
     wxShadowObjectFields    m_fields;
 };
 

-#endif // wxABI_VERSION

 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 


@@ -162,10 +159,6 @@ protected:
 
 };
 
 
 };
 

-// not Motif-specific, but currently used only under Motif,
-// compiled to make wxMotif and wxGTK base libraries compatible
-#if defined(__WXMOTIF__) || wxABI_VERSION >= 20602
-

 #include "wx/vector.h"
 
 struct WXDLLIMPEXP_BASE wxClientDataDictionaryPair
 #include "wx/vector.h"
 
 struct WXDLLIMPEXP_BASE wxClientDataDictionaryPair


@@ -276,8 +269,5 @@ private:
     wxClientDataDictionaryPairVector m_vec;
 };
 
     wxClientDataDictionaryPairVector m_vec;
 };
 

-#endif // __WXMOTIF__
-
-// ----------------------------------------------------------------------------
-#endif
+#endif // _WX_CLNTDATAH__