More for wxPython 2.0b9 (hopefully the last...)

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

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 2d056fc1ed93b0e9f7d2430821aed54e631bfb89..213357b8ff5f230901788e306aac64627374a984 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -224,6 +224,7 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
     }
     else
     {
+        wxTheClipboard->m_waiting = FALSE;
         return FALSE;
     }
     
@@ -239,6 +240,7 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
        }
     }
   
+    wxTheClipboard->m_waiting = FALSE;
     return TRUE;
 }
 
@@ -388,12 +390,20 @@ void wxClipboard::Clear()
      
         if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
         {
+            m_waiting = TRUE;
+           
             gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom, GDK_CURRENT_TIME );
+           
+            while (m_waiting) gtk_main_iteration();
         }
     
         if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
         {
+            m_waiting = TRUE;
+           
             gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME );
+           
+            while (m_waiting) gtk_main_iteration();
         }
     
         if (m_dataBroker)