don't use deprecated toolbar API

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

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index e6b79180a1788863e5edceef654a7f47c18bc9b8..40b68026a023a2659bc92d14c687ec2974ec5d49 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -80,7 +80,7 @@ public:
 
     // 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") );


@@ -88,6 +88,17 @@ public:
         ms_clipboard = NULL;
     }
 
         ms_clipboard = NULL;
     }
 

+    // this method should be called if it's possible that no async clipboard
+    // operation is currently in progress (like it can be the case when the
+    // clipboard is cleared but not because we asked about it), it should only
+    // be called if such situation is expected -- otherwise call OnDone() which
+    // would assert in this case
+    static void OnDoneIfInProgress(wxClipboard *clipboard)
+    {
+        if ( ms_clipboard )
+            OnDone(clipboard);
+    }
+

 private:
     static wxClipboard *ms_clipboard;
 
 private:
     static wxClipboard *ms_clipboard;
 


@@ -199,7 +210,12 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
     if ( !clipboard )
         return TRUE;
 
     if ( !clipboard )
         return TRUE;
 

-    wxON_BLOCK_EXIT1(wxClipboardSync::OnDone, clipboard);
+    // notice the use of OnDoneIfInProgress() here instead of just OnDone():
+    // it's perfectly possible that we're receiving this notification from GTK+
+    // even though we hadn't cleared the clipboard ourselves but because
+    // another application (or even another window in the same program)
+    // acquired it
+    wxON_BLOCK_EXIT1(wxClipboardSync::OnDoneIfInProgress, clipboard);

 
     wxClipboard::Kind kind;
     if (event->selection == GDK_SELECTION_PRIMARY)
 
     wxClipboard::Kind kind;
     if (event->selection == GDK_SELECTION_PRIMARY)


@@ -283,29 +299,29 @@ selection_handler( GtkWidget *WXUNUSED(widget),
 
     if (size == 0) return;
 
 
     if (size == 0) return;
 

-    void *d = malloc(size);
-    wxON_BLOCK_EXIT1(free, d);
+    wxCharBuffer buf(size);

 
 

-    // 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
+    data->GetDataHere( format, buf.data() );

 
 

-    // 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

     {
         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 );
     }
 }


@@ -347,8 +363,6 @@ wxClipboard::wxClipboard()
     m_formatSupported = false;
     m_targetRequested = 0;
 
     m_formatSupported = false;
     m_targetRequested = 0;
 

-    m_usePrimary = false;
-

     // we use m_targetsWidget to query what formats are available
     m_targetsWidget = gtk_window_new( GTK_WINDOW_POPUP );
     gtk_widget_realize( m_targetsWidget );
     // we use m_targetsWidget to query what formats are available
     m_targetsWidget = gtk_window_new( GTK_WINDOW_POPUP );
     gtk_widget_realize( m_targetsWidget );


@@ -379,10 +393,8 @@ wxClipboard::~wxClipboard()
 {
     Clear();
 
 {
     Clear();
 

-    if ( m_clipboardWidget )
-        gtk_widget_destroy( m_clipboardWidget );
-    if ( m_targetsWidget )
-        gtk_widget_destroy( m_targetsWidget );
+    gtk_widget_destroy( m_clipboardWidget );
+    gtk_widget_destroy( m_targetsWidget );

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -397,7 +409,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;


@@ -427,7 +439,7 @@ void wxClipboard::AddSupportedTarget(GdkAtom atom)
 {
     gtk_selection_add_target
     (
 {
     gtk_selection_add_target
     (

-        GTK_WIDGET(m_clipboardWidget),
+        m_clipboardWidget,

         GTKGetClipboardAtom(),
         atom,
         0 // info (same as client data) unused
         GTKGetClipboardAtom(),
         atom,
         0 // info (same as client data) unused