revert some stuff for 1.6

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

diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index f756dcc2a1c8ea23e3e7d28c1c270b7d9f972061..83cdd0cf4b524dc0d3fd03272f4994fb05e91c54 100644 (file)
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     9-Oct-2001
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CLNTDATAH__
 #define _WX_CLNTDATAH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "clntdata.h"
 #endif
 
@@ -29,14 +29,14 @@ enum wxClientDataType
     wxClientData_Void     // client data is untyped and we don't own it
 };
 
-class WXDLLEXPORT wxClientData
+class WXDLLIMPEXP_BASE wxClientData
 {
 public:
     wxClientData() { }
     virtual ~wxClientData() { }
 };
 
-class WXDLLEXPORT wxStringClientData : public wxClientData
+class WXDLLIMPEXP_BASE wxStringClientData : public wxClientData
 {
 public:
     wxStringClientData() : m_data() { }
@@ -48,18 +48,16 @@ private:
     wxString  m_data;
 };
 
-
-
 // This class is a mixin that provides storage and management of "client
 // data."  The client data stored can either be a pointer to a wxClientData
-// object in which case it is managed by the container (i.e.  it will delete
+// object in which case it is managed by the container (i.e. it will delete
 // the data when it's destroyed) or an untyped pointer which won't be deleted
 // by the container - but not both of them
 //
 // NOTE:  This functionality is currently duplicated in wxEvtHandler in order
-//        to avoid having more than one vtable in that class heirachy.
+//        to avoid having more than one vtable in that class hierarchy.
 
-class WXDLLEXPORT wxClientDataContainer
+class WXDLLIMPEXP_BASE wxClientDataContainer
 {
 public:
     wxClientDataContainer();
@@ -73,10 +71,10 @@ public:
 
 protected:
     // The user data: either an object which will be deleted by the container
-    // when it's deleted or some raw pointer which we do nothing with - only
-    // one type of data can be used with the given window (i.e. you cannot set
+    // when it's deleted or some raw pointer which we do nothing with. Only
+    // one type of data can be used with the given window, i.e. you cannot set
     // the void data and then associate the container with wxClientData or vice
-    // versa)
+    // versa.
     union
     {
         wxClientData *m_clientObject;
@@ -100,7 +98,7 @@ protected:
 
 #include <wx/vector.h>
 
-struct WXDLLEXPORT wxClientDataDictionaryPair
+struct WXDLLIMPEXP_BASE wxClientDataDictionaryPair
 {
     wxClientDataDictionaryPair( size_t idx ) : index( idx ), data( 0 ) { }
 
@@ -112,14 +110,14 @@ WX_DECLARE_VECTOR(wxClientDataDictionaryPair,wxClientDataDictionaryPairVector);
 
 // this class is used internally to maintain the association between items
 // of (some subclasses of) wxControlWithItems and their client data
-// NOTE: this class does not keep track if it contains
-// wxClientData or void*, the client must ensure that
+// NOTE: this class does not keep track of whether it contains
+// wxClientData or void*. The client must ensure that
 // it does not contain a mix of the two, and that
 // DestroyData is called if it contains wxClientData
-class WXDLLEXPORT wxClientDataDictionary
+class WXDLLIMPEXP_BASE wxClientDataDictionary
 {
 public:
-    wxClientDataDictionary() {};
+    wxClientDataDictionary() {}
 
     // deletes all the data
     void DestroyData()