X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a164d4c4e75bd48f6a0a484fb267b0dc337c541..bcd846ea7191d33d86e28ee1927b461c54d2fb8f:/src/gtk/dnd.cpp?ds=sidebyside diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index d03f079cc8..c56c806047 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -7,10 +7,6 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dnd.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -510,7 +506,13 @@ GdkAtom wxDropTarget::GetMatchingPair() GList *child = m_dragContext->targets; while (child) { - GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data); + // in GTK+ 1.x GdkAtom was a gulong, but now it's a pointer + GdkAtom formatAtom = +#ifdef __WXGTK20__ + (GdkAtom)(child->data); +#else + GPOINTER_TO_INT(child->data); +#endif wxDataFormat format( formatAtom ); #ifdef __WXDEBUG__