X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae500232a4e961a567a5fb375fcf4f4a23216bd2..7eb872f4d67141f723745f04b478dda03907d4b6:/include/wx/clntdata.h diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h index 1b54507cbe..1fc54ba6a4 100644 --- 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() { } @@ -57,7 +57,7 @@ private: // NOTE: This functionality is currently duplicated in wxEvtHandler in order // to avoid having more than one vtable in that class hierarchy. -class WXDLLEXPORT wxClientDataContainer +class WXDLLIMPEXP_BASE wxClientDataContainer { public: wxClientDataContainer(); @@ -98,7 +98,7 @@ protected: #include -struct WXDLLEXPORT wxClientDataDictionaryPair +struct WXDLLIMPEXP_BASE wxClientDataDictionaryPair { wxClientDataDictionaryPair( size_t idx ) : index( idx ), data( 0 ) { } @@ -114,7 +114,7 @@ WX_DECLARE_VECTOR(wxClientDataDictionaryPair,wxClientDataDictionaryPairVector); // 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() {};