Fix after removal of PRIOR/NEXT in common headers.

[wxWidgets.git] / src / gtk1 / dnd.cpp

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index c56c8060470cd1e435aa2af66a514af6f00e87d6..46a175b0934d3011e2169564148f1a9197965937 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -22,7 +22,7 @@
 #include "wx/intl.h"
 #include "wx/utils.h"
 
 #include "wx/intl.h"
 #include "wx/utils.h"
 

-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"

 
 #include <gdk/gdkprivate.h>
 
 
 #include <gdk/gdkprivate.h>
 


@@ -359,7 +359,7 @@ static gboolean target_drag_drop( GtkWidget *widget,
         GdkAtom format = drop_target->GetMatchingPair();
 
         // this does happen somehow, see bug 555111
         GdkAtom format = drop_target->GetMatchingPair();
 
         // this does happen somehow, see bug 555111

-        wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") )
+        wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") );

 
 /*
         GdkDragAction action = GDK_ACTION_MOVE;
 
 /*
         GdkDragAction action = GDK_ACTION_MOVE;


@@ -506,13 +506,7 @@ GdkAtom wxDropTarget::GetMatchingPair()
     GList *child = m_dragContext->targets;
     while (child)
     {
     GList *child = m_dragContext->targets;
     while (child)
     {

-        // 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
+        GdkAtom formatAtom = GPOINTER_TO_INT(child->data);

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


@@ -823,18 +817,14 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
     gdk_window_get_size (pixmap, &width, &height);
 
     GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
     gdk_window_get_size (pixmap, &width, &height);
 
     GdkColormap *colormap = gtk_widget_get_colormap( m_widget );

-#ifndef __WXGTK20__

     gtk_widget_push_visual (gdk_colormap_get_visual (colormap));
     gtk_widget_push_visual (gdk_colormap_get_visual (colormap));

-#endif

     gtk_widget_push_colormap (colormap);
 
     m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP);
     gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
     gtk_widget_set_app_paintable (GTK_WIDGET (m_iconWindow), TRUE);
 
     gtk_widget_push_colormap (colormap);
 
     m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP);
     gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
     gtk_widget_set_app_paintable (GTK_WIDGET (m_iconWindow), TRUE);
 

-#ifndef __WXGTK20__

     gtk_widget_pop_visual ();
     gtk_widget_pop_visual ();

-#endif

     gtk_widget_pop_colormap ();
 
     gtk_widget_set_usize (m_iconWindow, width, height);
     gtk_widget_pop_colormap ();
 
     gtk_widget_set_usize (m_iconWindow, width, height);