Fixed the drawing of the HRules so they don't try to iterate over all

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

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index fdfeb4fade71e69a732008e29b9ec544ea9f1c9a..a95bf1c889202e58aa569d587fc9a8c9d0b41bb1 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -570,9 +570,9 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 // "drag_data_delete"
 //----------------------------------------------------------------------------
 
 // "drag_data_delete"
 //----------------------------------------------------------------------------
 

-static void source_drag_data_delete( GtkWidget          *WXUNUSED(widget),
-                                     GdkDragContext     *WXUNUSED(context),
-                                     wxDropSource       *WXUNUSED(drop_source) )
+static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
+                                     GdkDragContext *context,
+                                     wxDropSource *WXUNUSED(drop_source) )

 {
     if (g_isIdle)
         wxapp_install_idle_handler();
 {
     if (g_isIdle)
         wxapp_install_idle_handler();


@@ -800,11 +800,12 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
     /* don't start dragging if no button is down */
     if (button_number)
     {
     /* don't start dragging if no button is down */
     if (button_number)
     {

-        GdkDragAction action = GDK_ACTION_COPY;
-        if (allowMove) action = (GdkDragAction)(GDK_ACTION_MOVE|GDK_ACTION_COPY);
+        int action = GDK_ACTION_COPY;
+        if ( allowMove )
+            action |= GDK_ACTION_MOVE;

         GdkDragContext *context = gtk_drag_begin( m_widget,
                 target_list,
         GdkDragContext *context = gtk_drag_begin( m_widget,
                 target_list,

-                action,
+                (GdkDragAction)action,

                 button_number,  /* number of mouse button which started drag */
                 (GdkEvent*) &event );
 
                 button_number,  /* number of mouse button which started drag */
                 (GdkEvent*) &event );