added GetHimagelist()

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

diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index 1b54507cbed51f189299f8d1d9a40a5b17bf904e..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$
 // 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__
 
 // 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
 
     #pragma interface "clntdata.h"
 #endif
 


@@ -29,14 +29,14 @@ enum wxClientDataType
     wxClientData_Void     // client data is untyped and we don't own it
 };
 
     wxClientData_Void     // client data is untyped and we don't own it
 };
 

-class WXDLLEXPORT wxClientData
+class WXDLLIMPEXP_BASE wxClientData

 {
 public:
     wxClientData() { }
     virtual ~wxClientData() { }
 };
 
 {
 public:
     wxClientData() { }
     virtual ~wxClientData() { }
 };
 

-class WXDLLEXPORT wxStringClientData : public wxClientData
+class WXDLLIMPEXP_BASE wxStringClientData : public wxClientData

 {
 public:
     wxStringClientData() : m_data() { }
 {
 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.
 
 // 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();
 {
 public:
     wxClientDataContainer();


@@ -98,7 +98,7 @@ protected:
 
 #include <wx/vector.h>
 
 
 #include <wx/vector.h>
 

-struct WXDLLEXPORT wxClientDataDictionaryPair
+struct WXDLLIMPEXP_BASE wxClientDataDictionaryPair

 {
     wxClientDataDictionaryPair( size_t idx ) : index( idx ), data( 0 ) { }
 
 {
     wxClientDataDictionaryPair( size_t idx ) : index( idx ), data( 0 ) { }
 


@@ -114,10 +114,10 @@ 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
 // 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:
 {
 public:

-    wxClientDataDictionary() {};
+    wxClientDataDictionary() {}

 
     // deletes all the data
     void DestroyData()
 
     // deletes all the data
     void DestroyData()