Define wxUSE_NOTEBOOK for Mac. Required ny sizer.

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

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 745dec2fdb162fe8c298489e8a37b6356d0ce99d..e9db01eda47c94c2878f03dbb331d1499b7cb153 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -226,6 +226,11 @@ static gboolean target_drag_drop( GtkWidget *widget,
     if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy;
 */
 
     if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy;
 */
 

+    /* reset the block here as someone might very well
+       show a dialog as a reaction to a drop and this
+       wouldn't work without events */
+    g_blockEventsOnDrag = FALSE;
+    

     bool ret = drop_target->OnDrop( x, y );
 
     if (!ret)
     bool ret = drop_target->OnDrop( x, y );
 
     if (!ret)


@@ -740,8 +745,12 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
     if (m_data->GetFormatCount() == 0)
         return (wxDragResult) wxDragNone;
 
     if (m_data->GetFormatCount() == 0)
         return (wxDragResult) wxDragNone;
 

+    // still in drag
+    if (g_blockEventsOnDrag)
+        return (wxDragResult) wxDragNone;
+    

     // disabled for now
     // disabled for now

-    g_blockEventsOnDrag = FALSE;
+    g_blockEventsOnDrag = TRUE;

 
     RegisterWindow();
 
 
     RegisterWindow();