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

Privatize gtk_selection_request, gtk_selection_incr_event

Browse Source 
Mon Sep 23 19:49:11 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkselection.[ch] gtk/gtkwidget.c gtk/gtkmain.c:
        Privatize gtk_selection_request, gtk_selection_incr_event
        gtk_selection_notify, gtk_selection_property_notify.
        Add doc note about future deprecation of gtk_selection_clear()
        which. (#85683)

        * gtk/gtkoldeditable.c (gtk_old_editable_selection_clear):
        Chain up, rather than calling gtk_selection_clear().
This commit is contained in:
Owen Taylor
2002-09-23 23:59:23 +00:00
committed by Owen Taylor
parent c52f012774
commit b33ec36d36
12 changed files with 101 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Mon Sep 23 19:49:11 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkselection.[ch] gtk/gtkwidget.c gtk/gtkmain.c:
Privatize gtk_selection_request, gtk_selection_incr_event
gtk_selection_notify, gtk_selection_property_notify.
Add doc note about future deprecation of gtk_selection_clear()
which. (#85683)
* gtk/gtkoldeditable.c (gtk_old_editable_selection_clear):
Chain up, rather than calling gtk_selection_clear().
Mon Sep 23 18:53:35 2002 Owen Taylor <otaylor@redhat.com> Mon Sep 23 18:53:35 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): * gtk/gtkprogressbar.c (gtk_progress_bar_set_text):

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
Mon Sep 23 19:49:11 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkselection.[ch] gtk/gtkwidget.c gtk/gtkmain.c:
Privatize gtk_selection_request, gtk_selection_incr_event
gtk_selection_notify, gtk_selection_property_notify.
Add doc note about future deprecation of gtk_selection_clear()
which. (#85683)
* gtk/gtkoldeditable.c (gtk_old_editable_selection_clear):
Chain up, rather than calling gtk_selection_clear().
Mon Sep 23 18:53:35 2002 Owen Taylor <otaylor@redhat.com> Mon Sep 23 18:53:35 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): * gtk/gtkprogressbar.c (gtk_progress_bar_set_text):

11
ChangeLog.pre-2-2
View File

@ -1,3 +1,14 @@
Mon Sep 23 19:49:11 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkselection.[ch] gtk/gtkwidget.c gtk/gtkmain.c:
Privatize gtk_selection_request, gtk_selection_incr_event
gtk_selection_notify, gtk_selection_property_notify.
Add doc note about future deprecation of gtk_selection_clear()
which. (#85683)
* gtk/gtkoldeditable.c (gtk_old_editable_selection_clear):
Chain up, rather than calling gtk_selection_clear().
Mon Sep 23 18:53:35 2002 Owen Taylor <otaylor@redhat.com> Mon Sep 23 18:53:35 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): * gtk/gtkprogressbar.c (gtk_progress_bar_set_text):

11
ChangeLog.pre-2-4
View File

@ -1,3 +1,14 @@
Mon Sep 23 19:49:11 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkselection.[ch] gtk/gtkwidget.c gtk/gtkmain.c:
Privatize gtk_selection_request, gtk_selection_incr_event
gtk_selection_notify, gtk_selection_property_notify.
Add doc note about future deprecation of gtk_selection_clear()
which. (#85683)
* gtk/gtkoldeditable.c (gtk_old_editable_selection_clear):
Chain up, rather than calling gtk_selection_clear().
Mon Sep 23 18:53:35 2002 Owen Taylor <otaylor@redhat.com> Mon Sep 23 18:53:35 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): * gtk/gtkprogressbar.c (gtk_progress_bar_set_text):

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
Mon Sep 23 19:49:11 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkselection.[ch] gtk/gtkwidget.c gtk/gtkmain.c:
Privatize gtk_selection_request, gtk_selection_incr_event
gtk_selection_notify, gtk_selection_property_notify.
Add doc note about future deprecation of gtk_selection_clear()
which. (#85683)
* gtk/gtkoldeditable.c (gtk_old_editable_selection_clear):
Chain up, rather than calling gtk_selection_clear().
Mon Sep 23 18:53:35 2002 Owen Taylor <otaylor@redhat.com> Mon Sep 23 18:53:35 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): * gtk/gtkprogressbar.c (gtk_progress_bar_set_text):

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
Mon Sep 23 19:49:11 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkselection.[ch] gtk/gtkwidget.c gtk/gtkmain.c:
Privatize gtk_selection_request, gtk_selection_incr_event
gtk_selection_notify, gtk_selection_property_notify.
Add doc note about future deprecation of gtk_selection_clear()
which. (#85683)
* gtk/gtkoldeditable.c (gtk_old_editable_selection_clear):
Chain up, rather than calling gtk_selection_clear().
Mon Sep 23 18:53:35 2002 Owen Taylor <otaylor@redhat.com> Mon Sep 23 18:53:35 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): * gtk/gtkprogressbar.c (gtk_progress_bar_set_text):

2
docs/reference/gtk/gtk-sections.txt
View File

@ -4020,12 +4020,12 @@ gtk_selection_data_get_text
gtk_selection_data_get_targets gtk_selection_data_get_targets
gtk_selection_data_targets_include_text gtk_selection_data_targets_include_text
gtk_selection_remove_all gtk_selection_remove_all
gtk_selection_clear
gtk_selection_data_copy gtk_selection_data_copy
gtk_selection_data_free gtk_selection_data_free
<SUBSECTION Standard> <SUBSECTION Standard>
GTK_TYPE_SELECTION_DATA GTK_TYPE_SELECTION_DATA
<SUBSECTION Private> <SUBSECTION Private>
gtk_selection_clear
gtk_selection_incr_event gtk_selection_incr_event
gtk_selection_notify gtk_selection_notify
gtk_selection_property_notify gtk_selection_property_notify

4
gtk/gtkmain.c
View File

@ -1385,8 +1385,8 @@ gtk_main_do_event (GdkEvent *event)
* them specially * them specially
*/ */
if (event->type == GDK_PROPERTY_NOTIFY) if (event->type == GDK_PROPERTY_NOTIFY)
gtk_selection_incr_event (event->any.window, _gtk_selection_incr_event (event->any.window,
&event->property); &event->property);
else if (event->type == GDK_SETTING) else if (event->type == GDK_SETTING)
_gtk_settings_handle_event (&event->setting); _gtk_settings_handle_event (&event->setting);

2
gtk/gtkoldeditable.c
View File

@ -553,7 +553,7 @@ gtk_old_editable_selection_clear (GtkWidget *widget,
/* Let the selection handling code know that the selection /* Let the selection handling code know that the selection
* has been changed, since we've overriden the default handler */ * has been changed, since we've overriden the default handler */
if (!gtk_selection_clear (widget, event)) if (!parent_class->selection_clear_event (widget, event))
return FALSE; return FALSE;
if (old_editable->has_selection) if (old_editable->has_selection)

44
gtk/gtkselection.c
View File

@ -1008,15 +1008,19 @@ gtk_selection_init (void)
initialize = FALSE; initialize = FALSE;
} }
/************************************************************* /**
* gtk_selection_clear: * gtk_selection_clear:
* Handler for "selection_clear_event" * @widget: a #GtkWidget
* arguments: * @event: the event
* widget: *
* event: * The default handler for the GtkWidget::selection_clear_event
* results: * signal. Instead of calling this function, chain up from
*************************************************************/ * your selection_clear_event handler. Calling this function
* from any other context is illegal. This function will
* be deprecated in future versions of GTK+.
*
* Return value: %TRUE if the event was handled, otherwise false
**/
gboolean gboolean
gtk_selection_clear (GtkWidget *widget, gtk_selection_clear (GtkWidget *widget,
GdkEventSelection *event) GdkEventSelection *event)
@ -1052,7 +1056,7 @@ gtk_selection_clear (GtkWidget *widget,
/************************************************************* /*************************************************************
* gtk_selection_request: * _gtk_selection_request:
* Handler for "selection_request_event" * Handler for "selection_request_event"
* arguments: * arguments:
* widget: * widget:
@ -1061,8 +1065,8 @@ gtk_selection_clear (GtkWidget *widget,
*************************************************************/ *************************************************************/
gboolean gboolean
gtk_selection_request (GtkWidget *widget, _gtk_selection_request (GtkWidget *widget,
GdkEventSelection *event) GdkEventSelection *event)
{ {
GtkIncrInfo *info; GtkIncrInfo *info;
GList *tmp_list; GList *tmp_list;
@ -1275,7 +1279,7 @@ gtk_selection_request (GtkWidget *widget,
} }
/************************************************************* /*************************************************************
* gtk_selection_incr_event: * _gtk_selection_incr_event:
* Called whenever an PropertyNotify event occurs for an * Called whenever an PropertyNotify event occurs for an
* GdkWindow with user_data == NULL. These will be notifications * GdkWindow with user_data == NULL. These will be notifications
* that a window we are sending the selection to via the * that a window we are sending the selection to via the
@ -1290,8 +1294,8 @@ gtk_selection_request (GtkWidget *widget,
*************************************************************/ *************************************************************/
gboolean gboolean
gtk_selection_incr_event (GdkWindow *window, _gtk_selection_incr_event (GdkWindow *window,
GdkEventProperty *event) GdkEventProperty *event)
{ {
GList *tmp_list; GList *tmp_list;
GtkIncrInfo *info = NULL; GtkIncrInfo *info = NULL;
@ -1451,7 +1455,7 @@ gtk_selection_incr_timeout (GtkIncrInfo *info)
} }
/************************************************************* /*************************************************************
* gtk_selection_notify: * _gtk_selection_notify:
* Handler for "selection_notify_event" signals on windows * Handler for "selection_notify_event" signals on windows
* where a retrieval is currently in process. The selection * where a retrieval is currently in process. The selection
* owner has responded to our conversion request. * owner has responded to our conversion request.
@ -1464,8 +1468,8 @@ gtk_selection_incr_timeout (GtkIncrInfo *info)
*************************************************************/ *************************************************************/
gboolean gboolean
gtk_selection_notify (GtkWidget *widget, _gtk_selection_notify (GtkWidget *widget,
GdkEventSelection *event) GdkEventSelection *event)
{ {
GList *tmp_list; GList *tmp_list;
GtkRetrievalInfo *info = NULL; GtkRetrievalInfo *info = NULL;
@ -1540,7 +1544,7 @@ gtk_selection_notify (GtkWidget *widget,
} }
/************************************************************* /*************************************************************
* gtk_selection_property_notify: * _gtk_selection_property_notify:
* Handler for "property_notify_event" signals on windows * Handler for "property_notify_event" signals on windows
* where a retrieval is currently in process. The selection * where a retrieval is currently in process. The selection
* owner has added more data. * owner has added more data.
@ -1553,8 +1557,8 @@ gtk_selection_notify (GtkWidget *widget,
*************************************************************/ *************************************************************/
gboolean gboolean
gtk_selection_property_notify (GtkWidget *widget, _gtk_selection_property_notify (GtkWidget *widget,
GdkEventProperty *event) GdkEventProperty *event)
{ {
GList *tmp_list; GList *tmp_list;
GtkRetrievalInfo *info = NULL; GtkRetrievalInfo *info = NULL;

8
gtk/gtkselection.h
View File

@ -151,13 +151,13 @@ void gtk_selection_remove_all (GtkWidget *widget);
gboolean gtk_selection_clear (GtkWidget *widget, gboolean gtk_selection_clear (GtkWidget *widget,
GdkEventSelection *event); GdkEventSelection *event);
gboolean gtk_selection_request (GtkWidget *widget, gboolean _gtk_selection_request (GtkWidget *widget,
GdkEventSelection *event); GdkEventSelection *event);
gboolean gtk_selection_incr_event (GdkWindow *window, gboolean _gtk_selection_incr_event (GdkWindow *window,
GdkEventProperty *event); GdkEventProperty *event);
gboolean gtk_selection_notify (GtkWidget *widget, gboolean _gtk_selection_notify (GtkWidget *widget,
GdkEventSelection *event); GdkEventSelection *event);
gboolean gtk_selection_property_notify (GtkWidget *widget, gboolean _gtk_selection_property_notify (GtkWidget *widget,
GdkEventProperty *event); GdkEventProperty *event);
GType gtk_selection_data_get_type (void); GType gtk_selection_data_get_type (void);

6
gtk/gtkwidget.c
View File

@ -366,10 +366,10 @@ gtk_widget_class_init (GtkWidgetClass *klass)
klass->map_event = NULL; klass->map_event = NULL;
klass->unmap_event = NULL; klass->unmap_event = NULL;
klass->window_state_event = NULL; klass->window_state_event = NULL;
klass->property_notify_event = gtk_selection_property_notify; klass->property_notify_event = _gtk_selection_property_notify;
klass->selection_clear_event = gtk_selection_clear; klass->selection_clear_event = gtk_selection_clear;
klass->selection_request_event = gtk_selection_request; klass->selection_request_event = _gtk_selection_request;
klass->selection_notify_event = gtk_selection_notify; klass->selection_notify_event = _gtk_selection_notify;
klass->selection_received = NULL; klass->selection_received = NULL;
klass->proximity_in_event = NULL; klass->proximity_in_event = NULL;
klass->proximity_out_event = NULL; klass->proximity_out_event = NULL;