summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>1998-12-20 05:47:28 +0000
committerTim Janik <timj@src.gnome.org>1998-12-20 05:47:28 +0000
commitaf2c3bd16fadd5f3f1d00db8b84053cd6e648fd1 (patch)
tree4ef457db70b176e78bc0a850211704f4b0d8c9ae
parentcbf5479263eaadc6ad29b235bc6858991ad01cc4 (diff)
downloadgdk-pixbuf-af2c3bd16fadd5f3f1d00db8b84053cd6e648fd1.tar.gz
export the priority at which events are processed.
Sun Dec 20 04:48:59 1998 Tim Janik <timj@gtk.org> * gdk/gdk.h (GDK_PRIORITY_EVENTS): export the priority at which events are processed. * gtk/gtk[main|signal|container].[ch]: removed deprecated _interp variants: gtk_container_foreach_interp, gtk_idle_add_interp, gtk_timeout_add_interp, gtk_signal_connect_interp.
-rw-r--r--ChangeLog9
-rw-r--r--ChangeLog.pre-2-09
-rw-r--r--ChangeLog.pre-2-109
-rw-r--r--ChangeLog.pre-2-29
-rw-r--r--ChangeLog.pre-2-49
-rw-r--r--ChangeLog.pre-2-69
-rw-r--r--ChangeLog.pre-2-89
-rw-r--r--gdk/gdk.h40
-rw-r--r--gdk/gdkevents.c4
-rw-r--r--gdk/x11/gdkevents-x11.c4
-rw-r--r--gtk/gtkcontainer.c11
-rw-r--r--gtk/gtkcontainer.h5
-rw-r--r--gtk/gtkmain.c17
-rw-r--r--gtk/gtkmain.h8
-rw-r--r--gtk/gtksignal.c14
-rw-r--r--gtk/gtksignal.h7
16 files changed, 87 insertions, 86 deletions
diff --git a/ChangeLog b/ChangeLog
index 686205888..67fc78041 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sun Dec 20 04:48:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdk/gdk.h (GDK_PRIORITY_EVENTS): export the priority at which
+ events are processed.
+
+ * gtk/gtk[main|signal|container].[ch]: removed deprecated _interp
+ variants: gtk_container_foreach_interp, gtk_idle_add_interp,
+ gtk_timeout_add_interp, gtk_signal_connect_interp.
+
Sat Dec 19 18:45:30 PST 1998 Shawn T. Amundson <amundson@gtk.org>
* configure.in: added sv to ALL_LIGNUAS
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 686205888..67fc78041 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Sun Dec 20 04:48:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdk/gdk.h (GDK_PRIORITY_EVENTS): export the priority at which
+ events are processed.
+
+ * gtk/gtk[main|signal|container].[ch]: removed deprecated _interp
+ variants: gtk_container_foreach_interp, gtk_idle_add_interp,
+ gtk_timeout_add_interp, gtk_signal_connect_interp.
+
Sat Dec 19 18:45:30 PST 1998 Shawn T. Amundson <amundson@gtk.org>
* configure.in: added sv to ALL_LIGNUAS
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 686205888..67fc78041 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Sun Dec 20 04:48:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdk/gdk.h (GDK_PRIORITY_EVENTS): export the priority at which
+ events are processed.
+
+ * gtk/gtk[main|signal|container].[ch]: removed deprecated _interp
+ variants: gtk_container_foreach_interp, gtk_idle_add_interp,
+ gtk_timeout_add_interp, gtk_signal_connect_interp.
+
Sat Dec 19 18:45:30 PST 1998 Shawn T. Amundson <amundson@gtk.org>
* configure.in: added sv to ALL_LIGNUAS
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 686205888..67fc78041 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Sun Dec 20 04:48:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdk/gdk.h (GDK_PRIORITY_EVENTS): export the priority at which
+ events are processed.
+
+ * gtk/gtk[main|signal|container].[ch]: removed deprecated _interp
+ variants: gtk_container_foreach_interp, gtk_idle_add_interp,
+ gtk_timeout_add_interp, gtk_signal_connect_interp.
+
Sat Dec 19 18:45:30 PST 1998 Shawn T. Amundson <amundson@gtk.org>
* configure.in: added sv to ALL_LIGNUAS
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 686205888..67fc78041 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Sun Dec 20 04:48:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdk/gdk.h (GDK_PRIORITY_EVENTS): export the priority at which
+ events are processed.
+
+ * gtk/gtk[main|signal|container].[ch]: removed deprecated _interp
+ variants: gtk_container_foreach_interp, gtk_idle_add_interp,
+ gtk_timeout_add_interp, gtk_signal_connect_interp.
+
Sat Dec 19 18:45:30 PST 1998 Shawn T. Amundson <amundson@gtk.org>
* configure.in: added sv to ALL_LIGNUAS
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 686205888..67fc78041 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Sun Dec 20 04:48:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdk/gdk.h (GDK_PRIORITY_EVENTS): export the priority at which
+ events are processed.
+
+ * gtk/gtk[main|signal|container].[ch]: removed deprecated _interp
+ variants: gtk_container_foreach_interp, gtk_idle_add_interp,
+ gtk_timeout_add_interp, gtk_signal_connect_interp.
+
Sat Dec 19 18:45:30 PST 1998 Shawn T. Amundson <amundson@gtk.org>
* configure.in: added sv to ALL_LIGNUAS
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 686205888..67fc78041 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Sun Dec 20 04:48:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdk/gdk.h (GDK_PRIORITY_EVENTS): export the priority at which
+ events are processed.
+
+ * gtk/gtk[main|signal|container].[ch]: removed deprecated _interp
+ variants: gtk_container_foreach_interp, gtk_idle_add_interp,
+ gtk_timeout_add_interp, gtk_signal_connect_interp.
+
Sat Dec 19 18:45:30 PST 1998 Shawn T. Amundson <amundson@gtk.org>
* configure.in: added sv to ALL_LIGNUAS
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 48cc2acec..c929fe4d7 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -29,30 +29,31 @@ extern "C" {
/* Initialization, exit and events
*/
-void gdk_init (int *argc,
- char ***argv);
-void gdk_exit (int error_code);
-gchar* gdk_set_locale (void);
+#define GDK_PRIORITY_EVENTS (-10)
+void gdk_init (gint *argc,
+ gchar ***argv);
+void gdk_exit (gint error_code);
+gchar* gdk_set_locale (void);
-gint gdk_events_pending (void);
-GdkEvent *gdk_event_get (void);
-GdkEvent *gdk_event_get_graphics_expose (GdkWindow *window);
-void gdk_event_put (GdkEvent *event);
+gboolean gdk_events_pending (void);
+GdkEvent* gdk_event_get (void);
+GdkEvent* gdk_event_get_graphics_expose (GdkWindow *window);
+void gdk_event_put (GdkEvent *event);
-GdkEvent *gdk_event_copy (GdkEvent *event);
-void gdk_event_free (GdkEvent *event);
-guint32 gdk_event_get_time (GdkEvent *event);
+GdkEvent* gdk_event_copy (GdkEvent *event);
+void gdk_event_free (GdkEvent *event);
+guint32 gdk_event_get_time (GdkEvent *event);
-void gdk_event_handler_set (GdkEventFunc func,
- gpointer data,
- GDestroyNotify notify);
+void gdk_event_handler_set (GdkEventFunc func,
+ gpointer data,
+ GDestroyNotify notify);
-void gdk_set_show_events (gint show_events);
-void gdk_set_use_xshm (gint use_xshm);
+void gdk_set_show_events (gint show_events);
+void gdk_set_use_xshm (gint use_xshm);
-gint gdk_get_show_events (void);
-gint gdk_get_use_xshm (void);
-gchar *gdk_get_display (void);
+gint gdk_get_show_events (void);
+gint gdk_get_use_xshm (void);
+gchar* gdk_get_display (void);
guint32 gdk_time_get (void);
guint32 gdk_timer_get (void);
@@ -65,7 +66,6 @@ gint gdk_input_add_full (gint source,
GdkInputFunction function,
gpointer data,
GdkDestroyNotify destroy);
-#define gdk_input_add_interp gdk_input_add_full
gint gdk_input_add (gint source,
GdkInputCondition condition,
GdkInputFunction function,
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 40f157882..b55bef5d4 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -127,7 +127,7 @@ gdk_events_init (void)
event_poll_fd.fd = connection_number;
event_poll_fd.events = G_IO_IN;
- g_main_add_poll (&event_poll_fd, -10);
+ g_main_add_poll (&event_poll_fd, GDK_PRIORITY_EVENTS);
/* This is really crappy. We have to look into the display structure
* to find the base resource id. This is only needed for recording
@@ -160,7 +160,7 @@ gdk_events_init (void)
*--------------------------------------------------------------
*/
-gint
+gboolean
gdk_events_pending (void)
{
return (queued_events || putback_events);
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 40f157882..b55bef5d4 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -127,7 +127,7 @@ gdk_events_init (void)
event_poll_fd.fd = connection_number;
event_poll_fd.events = G_IO_IN;
- g_main_add_poll (&event_poll_fd, -10);
+ g_main_add_poll (&event_poll_fd, GDK_PRIORITY_EVENTS);
/* This is really crappy. We have to look into the display structure
* to find the base resource id. This is only needed for recording
@@ -160,7 +160,7 @@ gdk_events_init (void)
*--------------------------------------------------------------
*/
-gint
+gboolean
gdk_events_pending (void)
{
return (queued_events || putback_events);
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 541b30e4f..f375ae268 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1153,17 +1153,6 @@ gtk_container_foreach_unmarshal (GtkWidget *child,
}
void
-gtk_container_foreach_interp (GtkContainer *container,
- GtkCallbackMarshal marshal,
- gpointer callback_data,
- GtkDestroyNotify notify)
-{
- g_message ("gtk_container_foreach_interp() is deprecated");
- gtk_container_foreach_full (container, NULL, marshal,
- callback_data, notify);
-}
-
-void
gtk_container_foreach_full (GtkContainer *container,
GtkCallback callback,
GtkCallbackMarshal marshal,
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 74047d58b..61656f416 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -221,11 +221,6 @@ void gtk_container_unblock_resize (GtkContainer *container);
/* Use gtk_container_check_resize() instead */
gint gtk_container_need_resize (GtkContainer *container);
-/* use gtk_container_foreach_full() inistead */
-void gtk_container_foreach_interp (GtkContainer *container,
- GtkCallbackMarshal marshal,
- gpointer callback_data,
- GtkDestroyNotify notify);
#ifdef __cplusplus
}
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index f73ddc504..442961445 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1006,15 +1006,6 @@ gtk_timeout_add (guint32 interval,
return g_timeout_add_full (0, interval, function, data, NULL);
}
-guint
-gtk_timeout_add_interp (guint32 interval,
- GtkCallbackMarshal function,
- gpointer data,
- GtkDestroyNotify destroy)
-{
- return gtk_timeout_add_full (interval, NULL, function, data, destroy);
-}
-
void
gtk_timeout_remove (guint tag)
{
@@ -1061,14 +1052,6 @@ gtk_idle_add_priority (gint priority,
return g_idle_add_full (priority, function, data, NULL);
}
-guint
-gtk_idle_add_interp (GtkCallbackMarshal marshal,
- gpointer data,
- GtkDestroyNotify destroy)
-{
- return gtk_idle_add_full (GTK_PRIORITY_DEFAULT, NULL, marshal, data, destroy);
-}
-
void
gtk_idle_remove (guint tag)
{
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 3f742b513..2c7e4eab4 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -138,14 +138,6 @@ void gtk_key_snooper_remove (guint snooper_handler_id);
GdkEvent* gtk_get_current_event (void);
GtkWidget* gtk_get_event_widget (GdkEvent *event);
-/* deprecated */
-guint gtk_idle_add_interp (GtkCallbackMarshal marshal,
- gpointer data,
- GtkDestroyNotify destroy);
-guint gtk_timeout_add_interp (guint32 interval,
- GtkCallbackMarshal function,
- gpointer data,
- GtkDestroyNotify notify);
#ifdef __cplusplus
}
diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 26052d216..198e3b9ea 100644
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -761,20 +761,6 @@ gtk_signal_connect_full (GtkObject *object,
}
guint
-gtk_signal_connect_interp (GtkObject *object,
- const gchar *name,
- GtkCallbackMarshal func,
- gpointer func_data,
- GtkDestroyNotify destroy_func,
- gint after)
-{
- g_message ("gtk_signal_connect_interp() is deprecated");
-
- return gtk_signal_connect_full (object, name, NULL, func,
- func_data, destroy_func, FALSE, after);
-}
-
-guint
gtk_signal_connect_object (GtkObject *object,
const gchar *name,
GtkSignalFunc func,
diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h
index 1b803be0e..22103f070 100644
--- a/gtk/gtksignal.h
+++ b/gtk/gtksignal.h
@@ -185,13 +185,6 @@ void gtk_signal_set_funcs (GtkSignalMarshal marshal_func,
*/
GtkSignalQuery* gtk_signal_query (guint signal_id);
-/* deprecated */
-guint gtk_signal_connect_interp (GtkObject *object,
- const gchar *name,
- GtkCallbackMarshal func,
- gpointer data,
- GtkDestroyNotify destroy_func,
- gint after);
#ifdef __cplusplus
}