simplify/cleanup wxTheXXXList and wxGDIObject code (patch 1452023 from Paul Cornett)

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

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index 294e0fb3cbf6db6c3a4ae60ba2ae6814a87855cd..9f06257b3d91cc1f713d2e8fe623df9ff45dad19 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -257,7 +257,7 @@ selection_handler( GtkWidget *WXUNUSED(widget),
     // It shall return the time which was used to set the data.
     if (selection_data->target == g_timestampAtom)
     {
     // It shall return the time which was used to set the data.
     if (selection_data->target == g_timestampAtom)
     {

-        uint timestamp = GPOINTER_TO_UINT (signal_data);
+        guint timestamp = GPOINTER_TO_UINT (signal_data);

         gtk_selection_data_set(selection_data,
                                GDK_SELECTION_TYPE_INTEGER,
                                32,
         gtk_selection_data_set(selection_data,
                                GDK_SELECTION_TYPE_INTEGER,
                                32,


@@ -298,7 +298,7 @@ selection_handler( GtkWidget *WXUNUSED(widget),
             GDK_SELECTION_TYPE_STRING,
             8 * sizeof(gchar),
             (unsigned char*) d,
             GDK_SELECTION_TYPE_STRING,
             8 * sizeof(gchar),
             (unsigned char*) d,

-            size-1 );
+            size );

 
     free(d);
 }
 
     free(d);
 }


@@ -474,7 +474,7 @@ bool wxClipboard::AddData( wxDataObject *data )
     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
                         "selection_get",
                         GTK_SIGNAL_FUNC(selection_handler),
     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
                         "selection_get",
                         GTK_SIGNAL_FUNC(selection_handler),

-                        GUINT_TO_POINTER( gtk_get_current_event_time() ) );
+                        GUINT_TO_POINTER( gdk_event_get_time(gtk_get_current_event()) ) );

 
 #if wxUSE_THREADS
     /* disable GUI threads */
 
 #if wxUSE_THREADS
     /* disable GUI threads */