wxGTK1 compilation fix after last commit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 1157eef82da455142c6aed2edc485108b2d084fc..c56c8060470cd1e435aa2af66a514af6f00e87d6 100644 (file)
--- 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
     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
 #endif

-                             (child->data);

         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__
         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 1157eef82da455142c6aed2edc485108b2d084fc..c56c8060470cd1e435aa2af66a514af6f00e87d6 100644 (file)
--- 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
     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
 #endif

-                             (child->data);

         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__
         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__