Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

[wxWidgets.git] / include / wx / msw / ole / dataobj2.h

diff --git a/include/wx/msw/ole/dataobj2.h b/include/wx/msw/ole/dataobj2.h
index 8389942302c1514de666733afe18623aca9070a7..9b97e9fb0a14ecec0c8b088f0386a8704ac73b8d 100644 (file)
--- a/include/wx/msw/ole/dataobj2.h
+++ b/include/wx/msw/ole/dataobj2.h
@@ -5,7 +5,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.10.99
-// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -21,7 +20,7 @@
 //     rarely used). This is ugly, but I haven't found a solution for it yet.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBitmapDataObject : public wxBitmapDataObjectBase
+class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase
 {
 public:
     // ctors
@@ -51,7 +50,7 @@ private:
     // the DIB data
     void /* BITMAPINFO */ *m_data;
 
-    DECLARE_NO_COPY_CLASS(wxBitmapDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxBitmapDataObject);
 };
 
 // ----------------------------------------------------------------------------
@@ -60,7 +59,7 @@ private:
 // FIXME did I already mention it was ugly?
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBitmapDataObject2 : public wxBitmapDataObjectBase
+class WXDLLIMPEXP_CORE wxBitmapDataObject2 : public wxBitmapDataObjectBase
 {
 public:
     // ctors
@@ -84,14 +83,14 @@ public:
         { return SetData(len, buf); }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxBitmapDataObject2)
+    wxDECLARE_NO_COPY_CLASS(wxBitmapDataObject2);
 };
 
 // ----------------------------------------------------------------------------
 // wxFileDataObject - data object for CF_HDROP
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFileDataObject : public wxFileDataObjectBase
+class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase
 {
 public:
     wxFileDataObject() { }
@@ -112,14 +111,14 @@ public:
         { return SetData(len, buf); }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxFileDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxFileDataObject);
 };
 
 // ----------------------------------------------------------------------------
 // wxURLDataObject: data object for URLs
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxURLDataObject : public wxDataObjectComposite
+class WXDLLIMPEXP_CORE wxURLDataObject : public wxDataObjectComposite
 {
 public:
     // initialize with URL in ctor or use SetURL later
@@ -140,7 +139,7 @@ private:
     // last data object we got data in
     wxDataObjectSimple *m_dataObjectLast;
 
-    DECLARE_NO_COPY_CLASS(wxURLDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxURLDataObject);
 };
 
 #endif // _WX_MSW_OLE_DATAOBJ2_H