X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1eb65c24668845888c1be5d701e32e216c79af3..5df8beb1d95030c94f678458fc1980049f537992:/include/wx/dataobj.h diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index b860e208ec..04fbee454f 100644 --- a/include/wx/dataobj.h +++ b/include/wx/dataobj.h @@ -502,12 +502,13 @@ private: #if defined(__WXMSW__) #include "wx/msw/ole/dataobj2.h" - // wxURLDataObject defined in msw/ole/dataobj2.h -#else // !__WXMSW__ - #if defined(__WXGTK20__) - #include "wx/gtk/dataobj2.h" - #elif defined(__WXGTK__) +#elif defined(__WXGTK20__) + #include "wx/gtk/dataobj2.h" + // wxURLDataObject defined in msw/ole/dataobj2.h + +#else + #if defined(__WXGTK__) #include "wx/gtk1/dataobj2.h" #elif defined(__WXX11__) #include "wx/x11/dataobj2.h" @@ -533,7 +534,7 @@ private: wxString GetURL() const { return GetText(); } void SetURL(const wxString& url) { SetText(url); } }; -#endif // __WXMSW__/!__WXMSW__ +#endif #endif // wxUSE_DATAOBJ