X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/865bb3251ecf83ddac350b734f4fed1d258e250b..dc497201eb08e3de1402480e2ab97a6405335ecb:/src/gtk1/clipbrd.cpp diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp index a8fc2c7ee0..8adca083d2 100644 --- a/src/gtk1/clipbrd.cpp +++ b/src/gtk1/clipbrd.cpp @@ -7,10 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "clipbrd.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -40,10 +36,6 @@ GdkAtom g_clipboardAtom = 0; GdkAtom g_targetsAtom = 0; -#if defined(__WXGTK20__) && wxUSE_UNICODE -extern GdkAtom g_altTextAtom; -#endif - // the trace mask we use with wxLogTrace() - call // wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here // (there will be a *lot* of them!) @@ -119,7 +111,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), wxT("selection received for targets, format %s"), format.GetId().c_str() ); -// printf( "format %s requested %s\n", +// printf( "format %s requested %s\n", // gdk_atom_name( atoms[i] ), // gdk_atom_name( clipboard->m_targetRequested ) ); @@ -266,7 +258,7 @@ selection_handler( GtkWidget *WXUNUSED(widget), wxString::FromAscii(gdk_atom_name(selection_data->selection)).c_str() ); #endif - + if (!data->IsSupportedFormat( format )) return; int size = data->GetDataSize( format ); @@ -278,27 +270,12 @@ selection_handler( GtkWidget *WXUNUSED(widget), // Text data will be in UTF8 in Unicode mode. data->GetDataHere( selection_data->target, d ); -#ifdef __WXGTK20__ - // 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() - if (format == wxDataFormat(wxDF_UNICODETEXT)) - { - gtk_selection_data_set_text( - selection_data, - (const gchar*)d, - size); - } - else -#endif - { - gtk_selection_data_set( + gtk_selection_data_set( selection_data, GDK_SELECTION_TYPE_STRING, - 8*sizeof(gchar), + 8 * sizeof(gchar), (unsigned char*) d, - size ); - } + size-1 ); free(d); } @@ -454,9 +431,9 @@ bool wxClipboard::AddData( wxDataObject *data ) wxT("wxClipboard now supports atom %s"), array[i].GetId().c_str() ); -// printf( "added %s\n", +// printf( "added %s\n", // gdk_atom_name( array[i].GetFormatId() ) ); - + gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), clipboard, array[i], @@ -537,15 +514,6 @@ bool wxClipboard::IsSupported( const wxDataFormat& format ) while (m_waiting) gtk_main_iteration(); -#if defined(__WXGTK20__) && wxUSE_UNICODE - if (!m_formatSupported && format == wxDataFormat(wxDF_UNICODETEXT)) - { - // Another try with plain STRING format - extern GdkAtom g_altTextAtom; - return IsSupported(g_altTextAtom); - } -#endif - return m_formatSupported; }