iconv() really never set the trailing 0.

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

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 881b0dce875ecd4ee0d489b527e9d15d88a02270..9f9c3f827f070e2487fc7aa74f4c38f7f227ff82 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -28,8 +28,6 @@
 //-----------------------------------------------------------------------------
 
 #if wxUSE_THREADS
 //-----------------------------------------------------------------------------
 
 #if wxUSE_THREADS

-extern void wxapp_install_thread_wakeup();
-extern void wxapp_uninstall_thread_wakeup();

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -258,7 +256,7 @@ selection_handler( GtkWidget *WXUNUSED(widget),
     {
         const wchar_t *wstr = (const wchar_t *)d;
         size_t len = wxConvCurrent->WC2MB(NULL, wstr, 0);
     {
         const wchar_t *wstr = (const wchar_t *)d;
         size_t len = wxConvCurrent->WC2MB(NULL, wstr, 0);

-        char *str = malloc(len + 1);
+        char *str = (char*) malloc(len + 1);

         wxConvCurrent->WC2MB(str, wstr, len);
         str[len] = '\0';
 
         wxConvCurrent->WC2MB(str, wstr, len);
         str[len] = '\0';
 


@@ -341,7 +339,6 @@ void wxClipboard::Clear()
     {
 #if wxUSE_THREADS
         /* disable GUI threads */
     {
 #if wxUSE_THREADS
         /* disable GUI threads */

-        wxapp_uninstall_thread_wakeup();

 #endif
 
         /*  As we have data we also own the clipboard. Once we no longer own
 #endif
 
         /*  As we have data we also own the clipboard. Once we no longer own


@@ -374,7 +371,6 @@ void wxClipboard::Clear()
 
 #if wxUSE_THREADS
         /* re-enable GUI threads */
 
 #if wxUSE_THREADS
         /* re-enable GUI threads */

-        wxapp_install_thread_wakeup();

 #endif
     }
 
 #endif
     }
 


@@ -443,7 +439,6 @@ bool wxClipboard::AddData( wxDataObject *data )
 
 #if wxUSE_THREADS
     /* disable GUI threads */
 
 #if wxUSE_THREADS
     /* disable GUI threads */

-    wxapp_uninstall_thread_wakeup();

 #endif
 
     /* Tell the world we offer clipboard data */
 #endif
 
     /* Tell the world we offer clipboard data */


@@ -458,7 +453,6 @@ bool wxClipboard::AddData( wxDataObject *data )
 
 #if wxUSE_THREADS
     /* re-enable GUI threads */
 
 #if wxUSE_THREADS
     /* re-enable GUI threads */

-    wxapp_install_thread_wakeup();

 #endif
 
     return res;
 #endif
 
     return res;