callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of the unused event argument. Update all callers.

Browse Source 
2007-03-09  Matthias Clasen <mclasen@redhat.com>

        * gtk/gtktextview.c (gtk_text_view_end_selection_drag):
        Get rid of the unused event argument. Update all callers.

        * gtk/gtktextview.c (gtk_text_view_focus_out): Call
        gtk_text_view_end_selection_drag.  (#351671, Boyd Timothy)



svn path=/trunk/; revision=17449
This commit is contained in:
Matthias Clasen
2007-03-10 03:51:37 +00:00
committed by Matthias Clasen
parent 455bc10de5
commit e643f1ee89
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-03-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_end_selection_drag):
Get rid of the unused event argument. Update all callers.
* gtk/gtktextview.c (gtk_text_view_focus_out): Call
gtk_text_view_end_selection_drag. (#351671, Boyd Timothy)
2007-03-09 Matthias Clasen <mclasen@redhat.com> 2007-03-09 Matthias Clasen <mclasen@redhat.com>
* modules/input/gtkimcontextxim.c * modules/input/gtkimcontextxim.c

16
gtk/gtktextview.c
View File

@ -294,8 +294,7 @@ static void gtk_text_view_reset_im_context (GtkTextView *text_v
static void gtk_text_view_start_selection_drag (GtkTextView *text_view, static void gtk_text_view_start_selection_drag (GtkTextView *text_view,
const GtkTextIter *iter, const GtkTextIter *iter,
GdkEventButton *event); GdkEventButton *event);
static gboolean gtk_text_view_end_selection_drag (GtkTextView *text_view, static gboolean gtk_text_view_end_selection_drag (GtkTextView *text_view);
GdkEventButton *event);
static void gtk_text_view_start_selection_dnd (GtkTextView *text_view, static void gtk_text_view_start_selection_dnd (GtkTextView *text_view,
const GtkTextIter *iter, const GtkTextIter *iter,
GdkEventMotion *event); GdkEventMotion *event);
@ -3723,7 +3722,7 @@ gtk_text_view_grab_notify (GtkWidget *widget,
{ {
if (!was_grabbed) if (!was_grabbed)
{ {
gtk_text_view_end_selection_drag (GTK_TEXT_VIEW (widget), NULL); gtk_text_view_end_selection_drag (GTK_TEXT_VIEW (widget));
gtk_text_view_unobscure_mouse_cursor (GTK_TEXT_VIEW (widget)); gtk_text_view_unobscure_mouse_cursor (GTK_TEXT_VIEW (widget));
} }
} }
@ -4041,7 +4040,7 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
{ {
GtkTextIter iter; GtkTextIter iter;
gtk_text_view_end_selection_drag (text_view, event); gtk_text_view_end_selection_drag (text_view);
gtk_text_layout_get_iter_at_pixel (text_view->layout, gtk_text_layout_get_iter_at_pixel (text_view->layout,
&iter, &iter,
@ -4073,7 +4072,7 @@ gtk_text_view_button_release_event (GtkWidget *widget, GdkEventButton *event)
text_view->drag_start_y = -1; text_view->drag_start_y = -1;
} }
if (gtk_text_view_end_selection_drag (GTK_TEXT_VIEW (widget), event)) if (gtk_text_view_end_selection_drag (GTK_TEXT_VIEW (widget)))
return TRUE; return TRUE;
else if (text_view->pending_place_cursor_button == event->button) else if (text_view->pending_place_cursor_button == event->button)
{ {
@ -4140,6 +4139,8 @@ gtk_text_view_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
{ {
GtkTextView *text_view = GTK_TEXT_VIEW (widget); GtkTextView *text_view = GTK_TEXT_VIEW (widget);
gtk_text_view_end_selection_drag (text_view);
gtk_widget_queue_draw (widget); gtk_widget_queue_draw (widget);
DV(g_print (G_STRLOC": focus_out_event\n")); DV(g_print (G_STRLOC": focus_out_event\n"));
@ -5876,8 +5877,7 @@ gtk_text_view_start_selection_drag (GtkTextView *text_view,
/* returns whether we were really dragging */ /* returns whether we were really dragging */
static gboolean static gboolean
gtk_text_view_end_selection_drag (GtkTextView *text_view, gtk_text_view_end_selection_drag (GtkTextView *text_view)
GdkEventButton *event)
{ {
if (text_view->selection_drag_handler == 0) if (text_view->selection_drag_handler == 0)
return FALSE; return FALSE;
@ -6096,7 +6096,7 @@ gtk_text_view_destroy_layout (GtkTextView *text_view)
} }
gtk_text_view_stop_cursor_blink (text_view); gtk_text_view_stop_cursor_blink (text_view);
gtk_text_view_end_selection_drag (text_view, NULL); gtk_text_view_end_selection_drag (text_view);
g_object_unref (text_view->layout); g_object_unref (text_view->layout);
text_view->layout = NULL; text_view->layout = NULL;