From 43dc5fb14027416b4e9cefc1ddd48e6c3b1dd690 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 28 Sep 2005 09:30:16 +0000 Subject: [PATCH] wxGTK1 compilation fix after last commit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/dnd.cpp | 9 +++++---- src/gtk1/dnd.cpp | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index 1157eef82d..c56c806047 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -507,11 +507,12 @@ GdkAtom wxDropTarget::GetMatchingPair() while (child) { // in GTK+ 1.x GdkAtom was a gulong, but now it's a pointer - GdkAtom formatAtom = (GdkAtom) -#ifndef __WXGTK20__ - GPOINTER_TO_INT + GdkAtom formatAtom = +#ifdef __WXGTK20__ + (GdkAtom)(child->data); +#else + GPOINTER_TO_INT(child->data); #endif - (child->data); wxDataFormat format( formatAtom ); #ifdef __WXDEBUG__ diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp index 1157eef82d..c56c806047 100644 --- a/src/gtk1/dnd.cpp +++ b/src/gtk1/dnd.cpp @@ -507,11 +507,12 @@ GdkAtom wxDropTarget::GetMatchingPair() while (child) { // in GTK+ 1.x GdkAtom was a gulong, but now it's a pointer - GdkAtom formatAtom = (GdkAtom) -#ifndef __WXGTK20__ - GPOINTER_TO_INT + GdkAtom formatAtom = +#ifdef __WXGTK20__ + (GdkAtom)(child->data); +#else + GPOINTER_TO_INT(child->data); #endif - (child->data); wxDataFormat format( formatAtom ); #ifdef __WXDEBUG__ -- 2.45.2