** Fixes 342313. Use GTK_CHECK_VERSION instead of GTK_2_2.

** Fixes 342313.
* text/e-text.c: Use GTK_CHECK_VERSION instead of GTK_2_2.

svn path=/trunk/; revision=32365
This commit is contained in:
Hiroyuki Ikezoe
2006-07-21 05:47:37 +00:00
parent a4922ca221
commit 3bd80dbe0b
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2006-07-21 Hiroyuki Ikezoe <poincare@ikezoe.net>
** Fixes 342313.
* text/e-text.c: Use GTK_CHECK_VERSION instead of GTK_2_2.
2006-07-05 Rajeev ramanathan <rajeevramanathan_2004@yaoo.co.in>
* text/e-text.[ch]: Added code to render EText text

View File

@ -2505,7 +2505,7 @@ e_text_copy_clipboard (EText *text)
selection_end_pos - selection_start_pos);
gtk_clipboard_set_text (
#ifdef GTK_2_2
#if GTK_CHECK_VERSION (2, 2, 0)
gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas),
GDK_SELECTION_CLIPBOARD),
#else
@ -2605,7 +2605,7 @@ e_text_update_primary_selection (EText *text)
};
GtkClipboard *clipboard;
#ifdef GTK_2_2
#if GTK_CHECK_VERSION (2, 2, 0)
clipboard = gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas), GDK_SELECTION_PRIMARY);
#else
clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
@ -2644,7 +2644,7 @@ e_text_paste (EText *text, GdkAtom selection)
{
g_object_ref (text);
gtk_clipboard_request_text (
#ifdef GTK_2_2
#if GTK_CHECK_VERSION (2, 2, 0)
gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas),
selection),
@ -2779,7 +2779,7 @@ e_text_do_popup (EText *text, GdkEventButton *button, int position)
closure->position = position;
gtk_clipboard_request_contents (
#ifdef GTK_2_2
#if GTK_CHECK_VERSION (2, 2, 0)
gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas),
GDK_SELECTION_CLIPBOARD),