summaryrefslogtreecommitdiff
path: root/gtk/gtkmain.h
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>1998-12-07 02:31:19 +0000
committerTim Janik <timj@src.gnome.org>1998-12-07 02:31:19 +0000
commit33447a38564dbc0c0db28f9eb4efb86a16be1505 (patch)
tree07d1e49c3f003bc1170ff454b01f6469de16960f /gtk/gtkmain.h
parent031aa464c6c3ba3758412dae1c7c0da3f8dea14b (diff)
downloadgtk+-33447a38564dbc0c0db28f9eb4efb86a16be1505.tar.gz
reverted marius change to expose the type systems internal type info data
Mon Dec 7 03:08:39 1998 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.h: * gtk/gtktypeutils.c: reverted marius change to expose the type systems internal type info data to the user. if such functionality is required we should provide wrapped accessors, ala gtk_signal_query(). * gtk/gtksignal.c (gtk_signal_connect_by_type): reverted marius change, since it destroys the possibility to implement automatic marshaller lookups some day, and it also disables third party code's ability to connect to any signal. also the GtkTypeInfo structures are dynamically allocated memory portions, so only the type system is really allowed to access that stuff. Mon Dec 7 01:32:18 1998 Tim Janik <timj@gtk.org> * gtk/gtkfilesel.c (gtk_file_selection_key_press): always intercept the Tab key on the entry. the focus shouldn't get lost even if completion is attempted from an empty entry, since an empty entry string does indeed have a valid completion meaning (complete all). (gtk_file_selection_init): cast the gchar array parameter in calls to gtk_clist_new_with_titles() to quit compiler warnings. (check_dir): the no_stat_dirs struct must not be const, since we do indeed modify its contents. * gtk/testgtk.c (event_watcher): adapted prototype to fit new emission hook semantics. * gtk/gtksignal.h: * gtk/gtksignal.c: changed emission allocation, so we don't use a doubly linked list but link ourselfs (singly linked). changed emission hooks, they get the emision parameters passed as well now and are emitted during the actuall signal emission (after the RUN_FIRST class method, but prior to RUN_FIRST handlers). the existing restrictions do still apply to signal emission hooks, i.e. an emission may not be stopped or restarted from an emission hook. due to possibly huge perfomance impacts, frequent use of emision hooks is also not recommended. (gtk_signal_next_and_invalidate): added an assertments which explicits what the code assumes anyways: a maximum amount of 65535 signals. * gtk/gtkcontainer.h: deprecated gtk_container_foreach_interp(), gtk_container_foreach_full() should be used instead. * gtk/gtkmain.h: deprecated gtk_timeout_add_interp and gtk_idle_add_interp, since we provide _full variants. * gtk/gtksignal.h: deprecated gtk_signal_connect_interp(), we provide gtk_signal_connect_full() for long enough now.
Diffstat (limited to 'gtk/gtkmain.h')
-rw-r--r--gtk/gtkmain.h22
1 files changed, 12 insertions, 10 deletions
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 1d2cc8704a..28ab996b84 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -86,18 +86,14 @@ guint gtk_quit_add_full (guint main_level,
GtkDestroyNotify destroy);
void gtk_quit_remove (guint quit_handler_id);
void gtk_quit_remove_by_data (gpointer data);
+guint gtk_timeout_add (guint32 interval,
+ GtkFunction function,
+ gpointer data);
guint gtk_timeout_add_full (guint32 interval,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy);
-guint gtk_timeout_add (guint32 interval,
- GtkFunction function,
- gpointer data);
-guint gtk_timeout_add_interp (guint32 interval,
- GtkCallbackMarshal function,
- gpointer data,
- GtkDestroyNotify notify);
void gtk_timeout_remove (guint timeout_handler_id);
guint gtk_idle_add (GtkFunction function,
@@ -110,9 +106,6 @@ guint gtk_idle_add_full (gint priority,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy);
-guint gtk_idle_add_interp (GtkCallbackMarshal marshal,
- gpointer data,
- GtkDestroyNotify destroy);
void gtk_idle_remove (guint idle_handler_id);
void gtk_idle_remove_by_data (gpointer data);
guint gtk_input_add_full (gint source,
@@ -132,6 +125,15 @@ 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
}
#endif /* __cplusplus */