Commented out testthreads from the build process, since we won't have any
Tue Dec 15 01:38:53 1998 Owen Taylor <otaylor@redhat.com> * gtk/Makefile.am: Commented out testthreads from the build process, since we won't have any idea how to create a thread. * configure.in (LIBS): use glib-config ... gthread so we always build a thread-compatible library. * gtk/gtkaccellabel.c gtk/gtkclist.c gtk/gtkcolorsel.c gtk/gtkcombo.c gtk/gtkcontainer.c gtk/gtkentry.c gtk/gtklist.c gtk/gtkmenuitem.c gtk/gtknotebook.c gtk/gtkrange.c gtk/gtkselection.c gtk/gtkspinbutton.c gtk/gtktext.c gtk/gtktooltips.c gtk/gtkwidget.c: Add GTK_THREADS_ENTER/LEAVE pairs around timeouts and idles to account for the fact that they are no longer called within the GTK+ lock. * gtk/gtkprivate.h: Added definitions for locking the main GTK+ mutex. * gtk/gtkmain.c: Re-implement the main loop in terms of the GLib main loop. * gdk/gdk.h gdk/gdkthreads.c gdk/Makefile.am: Removed threading functionality, as it seems better to subsume GDK within the GTK+ lock than vice-versa. * gdk/gdkevents.c: New file, containing event handling bits from gdk.c. * gdk/gdkevents.c: Implement event source for GDK events. * configure.in gdk/gdkevents.c: Removed attempts to subtract base_id, which were already non-functional.
This commit is contained in:
@ -30,7 +30,7 @@ extern "C" {
|
||||
|
||||
#define GTK_PRIORITY_HIGH -20
|
||||
#define GTK_PRIORITY_INTERNAL -10
|
||||
#define GTK_PRIORITY_DEFAULT 0
|
||||
#define GTK_PRIORITY_DEFAULT -5
|
||||
#define GTK_PRIORITY_LOW 10
|
||||
|
||||
typedef void (*GtkModuleInitFunc) (gint *argc,
|
||||
@ -58,6 +58,13 @@ void gtk_init (int *argc,
|
||||
void gtk_exit (gint error_code);
|
||||
gchar* gtk_set_locale (void);
|
||||
gint gtk_events_pending (void);
|
||||
|
||||
/* The following is the event func GTK+ registers with GDK
|
||||
* we expose it mainly to allow filtering of events between
|
||||
* GDK and GTK+.
|
||||
*/
|
||||
void gtk_main_do_event (GdkEvent *event);
|
||||
|
||||
void gtk_main (void);
|
||||
guint gtk_main_level (void);
|
||||
void gtk_main_quit (void);
|
||||
@ -122,8 +129,10 @@ guint gtk_key_snooper_install (GtkKeySnoopFunc snooper,
|
||||
void gtk_key_snooper_remove (guint snooper_handler_id);
|
||||
|
||||
GdkEvent* gtk_get_current_event (void);
|
||||
GtkWidget* gtk_get_event_widget (GdkEvent *event);
|
||||
GtkWidget* gtk_get_event_widget (GdkEvent *event);
|
||||
|
||||
void gtk_threads_enter (void);
|
||||
void gtk_threads_leave (void);
|
||||
|
||||
/* deprecated */
|
||||
guint gtk_idle_add_interp (GtkCallbackMarshal marshal,
|
||||
|
||||
Reference in New Issue
Block a user