fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 3ab24136a84f1e78611bc05d136b5548817814ca..2938ec3861228f706f606342eee9347baadc7fa1 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -24,6 +24,7 @@
 #include "wx/clipbrd.h"
 
 #ifndef WX_PRECOMP
 #include "wx/clipbrd.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/app.h"

     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/dataobj.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/dataobj.h"


@@ -31,6 +32,7 @@
 
 #include "wx/scopedarray.h"
 #include "wx/scopeguard.h"
 
 #include "wx/scopedarray.h"
 #include "wx/scopeguard.h"

+#include "wx/evtloop.h"

 
 #include "wx/gtk/private.h"
 
 
 #include "wx/gtk/private.h"
 


@@ -73,8 +75,8 @@ public:
 
     ~wxClipboardSync()
     {
 
     ~wxClipboardSync()
     {

-        while ( ms_clipboard )
-            gtk_main_iteration();
+        while (ms_clipboard)
+            wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_CLIPBOARD);

     }
 
     // this method must be called by GTK+ callbacks to indicate that we got the
     }
 
     // this method must be called by GTK+ callbacks to indicate that we got the


@@ -101,7 +103,7 @@ public:
 private:
     static wxClipboard *ms_clipboard;
 
 private:
     static wxClipboard *ms_clipboard;
 

-    DECLARE_NO_COPY_CLASS(wxClipboardSync)
+    wxDECLARE_NO_COPY_CLASS(wxClipboardSync);

 };
 
 wxClipboard *wxClipboardSync::ms_clipboard = NULL;
 };
 
 wxClipboard *wxClipboardSync::ms_clipboard = NULL;


@@ -359,10 +361,10 @@ async_targets_selection_received( GtkWidget *WXUNUSED(widget),
 
     if (!clipboard->m_sink)
         return;
 
     if (!clipboard->m_sink)
         return;

-        
+

     wxClipboardEvent *event = new wxClipboardEvent(wxEVT_CLIPBOARD_CHANGED);
     event->SetEventObject( clipboard );
     wxClipboardEvent *event = new wxClipboardEvent(wxEVT_CLIPBOARD_CHANGED);
     event->SetEventObject( clipboard );

-    
+

     if ( !selection_data || selection_data->length <= 0 )
     {
         clipboard->m_sink->QueueEvent( event );
     if ( !selection_data || selection_data->length <= 0 )
     {
         clipboard->m_sink->QueueEvent( event );


@@ -404,7 +406,7 @@ async_targets_selection_received( GtkWidget *WXUNUSED(widget),
 
         event->AddFormat( format );
     }
 
         event->AddFormat( format );
     }

-    
+

     clipboard->m_sink->QueueEvent( event );
     clipboard->m_sink.Release();
 }
     clipboard->m_sink->QueueEvent( event );
     clipboard->m_sink.Release();
 }


@@ -438,7 +440,7 @@ wxClipboard::wxClipboard()
     g_signal_connect (m_targetsWidget, "selection_received",
                       G_CALLBACK (targets_selection_received), this);
 
     g_signal_connect (m_targetsWidget, "selection_received",
                       G_CALLBACK (targets_selection_received), this);
 

-    // we use m_targetsWidgetAsync to query what formats asynchronously
+    // we use m_targetsWidgetAsync to query what formats are available asynchronously

     m_targetsWidgetAsync = gtk_window_new( GTK_WINDOW_POPUP );
     gtk_widget_realize( m_targetsWidgetAsync );
 
     m_targetsWidgetAsync = gtk_window_new( GTK_WINDOW_POPUP );
     gtk_widget_realize( m_targetsWidgetAsync );
 


@@ -525,15 +527,15 @@ bool wxClipboard::IsSupportedAsync(wxEvtHandler *sink)
 {
     if (m_sink.get())
         return false;  // currently busy, come back later
 {
     if (m_sink.get())
         return false;  // currently busy, come back later

-        
+

     wxCHECK_MSG( sink, false, wxT("no sink given") );
     wxCHECK_MSG( sink, false, wxT("no sink given") );

-      
+

     m_sink = sink;
     gtk_selection_convert( m_targetsWidgetAsync,
                            GTKGetClipboardAtom(),
                            g_targetsAtom,
                            (guint32) GDK_CURRENT_TIME );
     m_sink = sink;
     gtk_selection_convert( m_targetsWidgetAsync,
                            GTKGetClipboardAtom(),
                            g_targetsAtom,
                            (guint32) GDK_CURRENT_TIME );

-                           
+

     return true;
 }
 
     return true;
 }