don't include private headers from wx/unix/evtloop.h

[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 99a3c680fc246ae4e0bf5ecb0b8ba7450bb6403e..a22759676bcfd5f624cd24341234d39dfecd01ab 100644 (file)
--- a/include/wx/msw/ole/dataobj2.h
+++ b/include/wx/msw/ole/dataobj2.h
@@ -7,7 +7,7 @@
 // Created:     21.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     21.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_OLE_DATAOBJ2_H
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_OLE_DATAOBJ2_H


@@ -21,7 +21,7 @@
 //     rarely used). This is ugly, but I haven't found a solution for it yet.
 // ----------------------------------------------------------------------------
 
 //     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
 {
 public:
     // ctors


@@ -60,7 +60,7 @@ private:
 // FIXME did I already mention it was ugly?
 // ----------------------------------------------------------------------------
 
 // FIXME did I already mention it was ugly?
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBitmapDataObject2 : public wxBitmapDataObjectBase
+class WXDLLIMPEXP_CORE wxBitmapDataObject2 : public wxBitmapDataObjectBase

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -91,7 +91,7 @@ private:
 // wxFileDataObject - data object for CF_HDROP
 // ----------------------------------------------------------------------------
 
 // wxFileDataObject - data object for CF_HDROP
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFileDataObject : public wxFileDataObjectBase
+class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase

 {
 public:
     wxFileDataObject() { }
 {
 public:
     wxFileDataObject() { }


@@ -119,10 +119,11 @@ private:
 // wxURLDataObject: data object for URLs
 // ----------------------------------------------------------------------------
 
 // wxURLDataObject: data object for URLs
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxURLDataObject : public wxDataObjectComposite
+class WXDLLIMPEXP_CORE wxURLDataObject : public wxDataObjectComposite

 {
 public:
 {
 public:

-    wxURLDataObject();
+    // initialize with URL in ctor or use SetURL later
+    wxURLDataObject(const wxString& url = wxEmptyString);

 
     // return the URL as string
     wxString GetURL() const;
 
     // return the URL as string
     wxString GetURL() const;