X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9317fd47263a9521466156d7bf0f7988000bf15..b6e5eaa59701315ca06996ff845872ca4122695f:/include/wx/dataobj.h diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index 544d90ef13..e1f345e2d9 100644 --- a/include/wx/dataobj.h +++ b/include/wx/dataobj.h @@ -250,7 +250,7 @@ private: // wxDataObject directly. // ---------------------------------------------------------------------------- -WX_DECLARE_LIST(wxDataObjectSimple, wxSimpleDataObjectList); +WX_DECLARE_EXPORTED_LIST(wxDataObjectSimple, wxSimpleDataObjectList); class WXDLLEXPORT wxDataObjectComposite : public wxDataObject { @@ -445,14 +445,23 @@ private: #if defined(__WXMSW__) #include "wx/msw/ole/dataobj2.h" -#elif defined(__WXMOTIF__) - // #include "wx/motif/dataobj2.h" -- not yet -#elif defined(__WXGTK__) - #include "wx/gtk/dataobj2.h" -#elif defined(__WXMAC__) - #include "wx/mac/dataobj2.h" -#elif defined(__WXPM__) - #include "wx/os2/dataobj2.h" -#endif + + // wxURLDataObject defined in msw/ole/dataobj2.h +#else // !__WXMSW__ + #if defined(__WXGTK__) + #include "wx/gtk/dataobj2.h" + #elif defined(__WXMAC__) + #include "wx/mac/dataobj2.h" + #elif defined(__WXPM__) + #include "wx/os2/dataobj2.h" + #endif + + // wxURLDataObject is simply wxTextDataObject with a different name + class WXDLLEXPORT wxURLDataObject : public wxTextDataObject + { + public: + wxString GetURL() const { return GetText(); } + }; +#endif // __WXMSW__/!__WXMSW__ #endif // _WX_DATAOBJ_H_BASE_