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 483b6beca4889861019d77c3cc6e1c27cb973eb4..2938ec3861228f706f606342eee9347baadc7fa1 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -24,18 +24,19 @@
 #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"
 #endif
 
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/dataobj.h"
 #endif
 

-#include "wx/ptr_scpd.h"
+#include "wx/scopedarray.h"

 #include "wx/scopeguard.h"
 #include "wx/scopeguard.h"

+#include "wx/evtloop.h"

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

-wxDECLARE_SCOPED_ARRAY(wxDataFormat, wxDataFormatArray)
-wxDEFINE_SCOPED_ARRAY(wxDataFormat, wxDataFormatArray)
+typedef wxScopedArray<wxDataFormat> wxDataFormatArray;

 
 // ----------------------------------------------------------------------------
 // data
 
 // ----------------------------------------------------------------------------
 // data


@@ -74,13 +75,13 @@ 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
     // result for our clipboard operation
     }
 
     // this method must be called by GTK+ callbacks to indicate that we got the
     // result for our clipboard operation

-    static void OnDone(wxClipboard *clipboard)
+    static void OnDone(wxClipboard * WXUNUSED_UNLESS_DEBUG(clipboard))

     {
         wxASSERT_MSG( clipboard == ms_clipboard,
                         _T("got notification for alien clipboard") );
     {
         wxASSERT_MSG( clipboard == ms_clipboard,
                         _T("got notification for alien clipboard") );


@@ -102,13 +103,13 @@ 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;
 
 // ============================================================================

-// clipboard ca;backs implementation
+// clipboard callbacks implementation

 // ============================================================================
 
 //-----------------------------------------------------------------------------
 // ============================================================================
 
 //-----------------------------------------------------------------------------


@@ -291,37 +292,39 @@ selection_handler( GtkWidget *WXUNUSED(widget),
                wxString::FromAscii(wxGtkString(gdk_atom_name(selection_data->selection))).c_str(),
                GPOINTER_TO_UINT( signal_data )
                );
                wxString::FromAscii(wxGtkString(gdk_atom_name(selection_data->selection))).c_str(),
                GPOINTER_TO_UINT( signal_data )
                );

-#endif
+#endif // __WXDEBUG__

 
 

-    if (!data->IsSupportedFormat( format )) return;
+    if ( !data->IsSupportedFormat( format ) )
+        return;

 
     int size = data->GetDataSize( format );
 
     int size = data->GetDataSize( format );

+    if ( !size )
+        return;

 
 

-    if (size == 0) return;
-
-    void *d = malloc(size);
-    wxON_BLOCK_EXIT1(free, d);
+    wxCharBuffer buf(size - 1); // it adds 1 internally (for NUL)

 
 

-    // Text data will be in UTF8 in Unicode mode.
-    data->GetDataHere( selection_data->target, d );
+    // text data must be returned in UTF8 if format is wxDF_UNICODETEXT
+    if ( !data->GetDataHere(format, buf.data()) )
+        return;

 
 

-    // NB: GTK+ requires special treatment of UTF8_STRING data, the text
-    //     would show as UTF-8 data interpreted as latin1 (?) in other
-    //     GTK+ apps if we used gtk_selection_data_set()
+    // use UTF8_STRING format if requested in Unicode build but just plain
+    // STRING one in ANSI or if explicitly asked in Unicode
+#if wxUSE_UNICODE

     if (format == wxDataFormat(wxDF_UNICODETEXT))
     {
         gtk_selection_data_set_text(
             selection_data,
     if (format == wxDataFormat(wxDF_UNICODETEXT))
     {
         gtk_selection_data_set_text(
             selection_data,

-            (const gchar*)d,
+            (const gchar*)buf.data(),

             size );
     }
     else
             size );
     }
     else

+#endif // wxUSE_UNICODE

     {
         gtk_selection_data_set(
             selection_data,
             GDK_SELECTION_TYPE_STRING,
             8*sizeof(gchar),
     {
         gtk_selection_data_set(
             selection_data,
             GDK_SELECTION_TYPE_STRING,
             8*sizeof(gchar),

-            (unsigned char*) d,
+            (const guchar*)buf.data(),

             size );
     }
 }
             size );
     }
 }


@@ -342,6 +345,73 @@ void wxClipboard::GTKOnSelectionReceived(const GtkSelectionData& sel)
     m_formatSupported = true;
 }
 
     m_formatSupported = true;
 }
 

+//-----------------------------------------------------------------------------
+// asynchronous "selection_received" for targets
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void
+async_targets_selection_received( GtkWidget *WXUNUSED(widget),
+                            GtkSelectionData *selection_data,
+                            guint32 WXUNUSED(time),
+                            wxClipboard *clipboard )
+{
+    if ( !clipboard ) // Assert?
+        return;
+
+    if (!clipboard->m_sink)
+        return;
+
+    wxClipboardEvent *event = new wxClipboardEvent(wxEVT_CLIPBOARD_CHANGED);
+    event->SetEventObject( clipboard );
+
+    if ( !selection_data || selection_data->length <= 0 )
+    {
+        clipboard->m_sink->QueueEvent( event );
+        clipboard->m_sink.Release();
+        return;
+    }
+
+    // make sure we got the data in the correct form
+    GdkAtom type = selection_data->type;
+    if ( type != GDK_SELECTION_TYPE_ATOM )
+    {
+        if ( strcmp(wxGtkString(gdk_atom_name(type)), "TARGETS") != 0 )
+        {
+            wxLogTrace( TRACE_CLIPBOARD,
+                        _T("got unsupported clipboard target") );
+
+            clipboard->m_sink->QueueEvent( event );
+            clipboard->m_sink.Release();
+            return;
+        }
+    }
+
+#ifdef __WXDEBUG__
+    // it's not really a format, of course, but we can reuse its GetId() method
+    // to format this atom as string
+    wxDataFormat clip(selection_data->selection);
+    wxLogTrace( TRACE_CLIPBOARD,
+                wxT("Received available formats for clipboard %s"),
+                clip.GetId().c_str() );
+#endif // __WXDEBUG__
+
+    // the atoms we received, holding a list of targets (= formats)
+    const GdkAtom * const atoms = (GdkAtom *)selection_data->data;
+    for ( size_t i = 0; i < selection_data->length/sizeof(GdkAtom); i++ )
+    {
+        const wxDataFormat format(atoms[i]);
+
+        wxLogTrace(TRACE_CLIPBOARD, wxT("\t%s"), format.GetId().c_str());
+
+        event->AddFormat( format );
+    }
+
+    clipboard->m_sink->QueueEvent( event );
+    clipboard->m_sink.Release();
+}
+}
+

 // ============================================================================
 // wxClipboard implementation
 // ============================================================================
 // ============================================================================
 // wxClipboard implementation
 // ============================================================================


@@ -370,6 +440,13 @@ 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 are available asynchronously
+    m_targetsWidgetAsync = gtk_window_new( GTK_WINDOW_POPUP );
+    gtk_widget_realize( m_targetsWidgetAsync );
+
+    g_signal_connect (m_targetsWidgetAsync, "selection_received",
+                      G_CALLBACK (async_targets_selection_received), this);
+

     // we use m_clipboardWidget to get and to offer data
     m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP );
     gtk_widget_realize( m_clipboardWidget );
     // we use m_clipboardWidget to get and to offer data
     m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP );
     gtk_widget_realize( m_clipboardWidget );


@@ -409,7 +486,7 @@ GdkAtom wxClipboard::GTKGetClipboardAtom() const
 
 void wxClipboard::GTKClearData(Kind kind)
 {
 
 void wxClipboard::GTKClearData(Kind kind)
 {

-    wxDataObject *&data = Data();
+    wxDataObject *&data = Data(kind);

     if ( data )
     {
         delete data;
     if ( data )
     {
         delete data;


@@ -446,6 +523,22 @@ void wxClipboard::AddSupportedTarget(GdkAtom atom)
     );
 }
 
     );
 }
 

+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;
+    gtk_selection_convert( m_targetsWidgetAsync,
+                           GTKGetClipboardAtom(),
+                           g_targetsAtom,
+                           (guint32) GDK_CURRENT_TIME );
+
+    return true;
+}
+

 bool wxClipboard::DoIsSupported(const wxDataFormat& format)
 {
     wxCHECK_MSG( format, false, wxT("invalid clipboard format") );
 bool wxClipboard::DoIsSupported(const wxDataFormat& format)
 {
     wxCHECK_MSG( format, false, wxT("invalid clipboard format") );