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

added gdk_flush() after g_main_run(), so we get the original behaviour

Browse Source 
Fri Dec 18 01:32:59 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkmain.c (gtk_main): added gdk_flush() after g_main_run(), so we
        get the original behaviour back, i.e. the event queue needs to be flushed
        after a main loop has been quitted.
        (gtk_main): add/remove the current main loop to/from the main loop
        before/after init/quit functions have been exected to preserve the
        original gtk_main_quit() behaviour.

Thu Dec 17 23:48:29 1998  Tim Janik  <timj@gtk.org>

        * gdk/gdkevents.c (gdk_events_init): changed argument order in call
        to g_main_add_poll() to match recent glib changes.
This commit is contained in:
Tim Janik
1998-12-18 02:23:48 +00:00
committed by Tim Janik
parent 11339ec5b3
commit d2dc06dae1
11 changed files with 118 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtkmain.c
View File

@ -432,12 +432,13 @@ gtk_main (void)
GList *tmp_list;
GList *functions;
GtkInitFunction *init;
GMainLoop *loop;
GSList *tmp_node;
gtk_main_loop_level++;
loop = g_main_new (TRUE);
main_loops = g_slist_prepend (main_loops, loop);
tmp_list = functions = init_functions;
init_functions = NULL;
@ -450,19 +451,14 @@ gtk_main (void)
g_free (init);
}
g_list_free (functions);
loop = g_main_new ();
main_loops = g_slist_prepend (main_loops, loop);
GDK_THREADS_LEAVE ();
g_main_run (loop);
GDK_THREADS_ENTER ();
g_main_destroy (loop);
tmp_node = main_loops;
main_loops = g_slist_remove_link (main_loops, main_loops);
g_slist_free_1 (tmp_node);
if (g_main_is_running (main_loops->data))
{
GDK_THREADS_LEAVE ();
g_main_run (loop);
GDK_THREADS_ENTER ();
gdk_flush ();
}
if (quit_functions)
{
@ -496,8 +492,14 @@ gtk_main (void)
work->next = quit_functions;
quit_functions = work;
}
gdk_flush ();
}
main_loops = g_slist_remove (main_loops, loop);
g_main_destroy (loop);
gtk_main_loop_level--;
}
@ -510,6 +512,8 @@ gtk_main_level (void)
void
gtk_main_quit (void)
{
g_return_if_fail (main_loops != NULL);
g_main_quit (main_loops->data);
}