Don't allow concurrent requests, check return message of async request

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

diff --git a/samples/clipboard/clipboard.cpp b/samples/clipboard/clipboard.cpp
index 6a20dea42ca1eed5919062179091b2ef2f5caaa7..3843e7ab2c35ae0ee7dcd79de8852a866220fc3b 100644 (file)
--- a/samples/clipboard/clipboard.cpp
+++ b/samples/clipboard/clipboard.cpp
@@ -27,7 +27,7 @@
 #endif
 
 
 #endif
 
 

-#define USE_ASYNCHRONOUS_CLIPBOARD_REQUEST 0
+#define USE_ASYNCHRONOUS_CLIPBOARD_REQUEST 1

 
 class MyApp : public wxApp
 {
 
 class MyApp : public wxApp
 {


@@ -167,7 +167,12 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent&event)
 #if USE_ASYNCHRONOUS_CLIPBOARD_REQUEST
     if (m_request == Idle)
     {
 #if USE_ASYNCHRONOUS_CLIPBOARD_REQUEST
     if (m_request == Idle)
     {

-        wxTheClipboard->IsSupportedAsync( this );
+        if (!wxTheClipboard->IsSupportedAsync( this ))
+        {
+            // request failed, try again later
+            event.Enable( m_clipboardSupportsText ); // not yet known, assume last value
+            return;
+        }

         m_request = Waiting;
         event.Enable( m_clipboardSupportsText ); // not yet known, assume last value
     } 
         m_request = Waiting;
         event.Enable( m_clipboardSupportsText ); // not yet known, assume last value
     } 

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 55a2ba66c610ffaf267ce703a8540dc7356eb96a..15ffd8be44b703f29bcbc00688f0697544092cff 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -367,6 +367,7 @@ async_targets_selection_received( GtkWidget *WXUNUSED(widget),
     if ( !selection_data || selection_data->length <= 0 )
     {
         clipboard->m_sink->QueueEvent( event );
     if ( !selection_data || selection_data->length <= 0 )
     {
         clipboard->m_sink->QueueEvent( event );

+        clipboard->m_sink.Release();

         return;
     }
 
         return;
     }
 


@@ -380,6 +381,7 @@ async_targets_selection_received( GtkWidget *WXUNUSED(widget),
                         _T("got unsupported clipboard target") );
 
             clipboard->m_sink->QueueEvent( event );
                         _T("got unsupported clipboard target") );
 
             clipboard->m_sink->QueueEvent( event );

+            clipboard->m_sink.Release();

             return;
         }
     }
             return;
         }
     }


@@ -405,6 +407,7 @@ async_targets_selection_received( GtkWidget *WXUNUSED(widget),
     }
     
     clipboard->m_sink->QueueEvent( event );
     }
     
     clipboard->m_sink->QueueEvent( event );

+    clipboard->m_sink.Release();

 }
 }
 
 }
 }
 


@@ -521,8 +524,12 @@ void wxClipboard::AddSupportedTarget(GdkAtom atom)
 
 bool wxClipboard::IsSupportedAsync(wxEvtHandler *sink)
 {
 
 bool wxClipboard::IsSupportedAsync(wxEvtHandler *sink)
 {

+    if (m_sink.get())
+        return false;  // currently busy, come back later
+        
+    wxCHECK_MSG( sink, false, wxT("no sink given") );
+      

     m_sink = sink;
     m_sink = sink;

-    

     gtk_selection_convert( m_targetsWidgetAsync,
                            GTKGetClipboardAtom(),
                            g_targetsAtom,
     gtk_selection_convert( m_targetsWidgetAsync,
                            GTKGetClipboardAtom(),
                            g_targetsAtom,