Add call to g_type_init() - we'll need this later, and this makes sure

Mon Jun  5 16:00:09 2000  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdk.c (gdk_init_check): Add call to g_type_init() - we'll
	need this later, and this makes sure that the atexit for
	glib gets called after that for GDK, so atexits are
	properly ordered for object leak checking.

	* gdk/gdk.c (gdk_exit_func): Call gdk_windowing_exit().

	* gdk/x11/gdkmain-x11.c (gdk_windowing_exit): Call
	pango_x_shutdown_display()

	* gtk/simple.c (main): Close window on destroy.
This commit is contained in:
Owen Taylor 2000-06-06 00:56:00 +00:00 committed by Owen Taylor
parent eaa77a4754
commit 3a917e9da7
12 changed files with 108 additions and 2 deletions

View File

@ -1,3 +1,17 @@
Mon Jun 5 16:00:09 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Add call to g_type_init() - we'll
need this later, and this makes sure that the atexit for
glib gets called after that for GDK, so atexits are
properly ordered for object leak checking.
* gdk/gdk.c (gdk_exit_func): Call gdk_windowing_exit().
* gdk/x11/gdkmain-x11.c (gdk_windowing_exit): Call
pango_x_shutdown_display()
* gtk/simple.c (main): Close window on destroy.
Mon Jun 5 11:50:02 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): We need

View File

@ -1,3 +1,17 @@
Mon Jun 5 16:00:09 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Add call to g_type_init() - we'll
need this later, and this makes sure that the atexit for
glib gets called after that for GDK, so atexits are
properly ordered for object leak checking.
* gdk/gdk.c (gdk_exit_func): Call gdk_windowing_exit().
* gdk/x11/gdkmain-x11.c (gdk_windowing_exit): Call
pango_x_shutdown_display()
* gtk/simple.c (main): Close window on destroy.
Mon Jun 5 11:50:02 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): We need

View File

@ -1,3 +1,17 @@
Mon Jun 5 16:00:09 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Add call to g_type_init() - we'll
need this later, and this makes sure that the atexit for
glib gets called after that for GDK, so atexits are
properly ordered for object leak checking.
* gdk/gdk.c (gdk_exit_func): Call gdk_windowing_exit().
* gdk/x11/gdkmain-x11.c (gdk_windowing_exit): Call
pango_x_shutdown_display()
* gtk/simple.c (main): Close window on destroy.
Mon Jun 5 11:50:02 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): We need

View File

@ -1,3 +1,17 @@
Mon Jun 5 16:00:09 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Add call to g_type_init() - we'll
need this later, and this makes sure that the atexit for
glib gets called after that for GDK, so atexits are
properly ordered for object leak checking.
* gdk/gdk.c (gdk_exit_func): Call gdk_windowing_exit().
* gdk/x11/gdkmain-x11.c (gdk_windowing_exit): Call
pango_x_shutdown_display()
* gtk/simple.c (main): Close window on destroy.
Mon Jun 5 11:50:02 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): We need

View File

@ -1,3 +1,17 @@
Mon Jun 5 16:00:09 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Add call to g_type_init() - we'll
need this later, and this makes sure that the atexit for
glib gets called after that for GDK, so atexits are
properly ordered for object leak checking.
* gdk/gdk.c (gdk_exit_func): Call gdk_windowing_exit().
* gdk/x11/gdkmain-x11.c (gdk_windowing_exit): Call
pango_x_shutdown_display()
* gtk/simple.c (main): Close window on destroy.
Mon Jun 5 11:50:02 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): We need

View File

@ -1,3 +1,17 @@
Mon Jun 5 16:00:09 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Add call to g_type_init() - we'll
need this later, and this makes sure that the atexit for
glib gets called after that for GDK, so atexits are
properly ordered for object leak checking.
* gdk/gdk.c (gdk_exit_func): Call gdk_windowing_exit().
* gdk/x11/gdkmain-x11.c (gdk_windowing_exit): Call
pango_x_shutdown_display()
* gtk/simple.c (main): Close window on destroy.
Mon Jun 5 11:50:02 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): We need

View File

@ -1,3 +1,17 @@
Mon Jun 5 16:00:09 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Add call to g_type_init() - we'll
need this later, and this makes sure that the atexit for
glib gets called after that for GDK, so atexits are
properly ordered for object leak checking.
* gdk/gdk.c (gdk_exit_func): Call gdk_windowing_exit().
* gdk/x11/gdkmain-x11.c (gdk_windowing_exit): Call
pango_x_shutdown_display()
* gtk/simple.c (main): Close window on destroy.
Mon Jun 5 11:50:02 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkgc-x11.c (gdk_x11_gc_values_to_xvalues): We need

View File

@ -277,7 +277,7 @@ gdk_init_check (int *argc,
if (gdk_initialized)
return TRUE;
if (g_thread_supported ())
gdk_threads_mutex = g_mutex_new ();
@ -321,6 +321,8 @@ gdk_init_check (int *argc,
GDK_NOTE (MISC, g_message ("progname: \"%s\"", g_get_prgname ()));
g_type_init ();
result = _gdk_windowing_init_check (argc_orig, argv_orig);
for (i = 0; i < argc_orig; i++)
@ -425,6 +427,8 @@ gdk_exit_func (void)
gdk_image_exit ();
gdk_input_exit ();
gdk_key_repeat_restore ();
gdk_windowing_exit ();
gdk_initialized = 0;
}

View File

@ -563,6 +563,8 @@ gdk_beep (void)
void
gdk_windowing_exit (void)
{
pango_x_shutdown_display (gdk_display);
XCloseDisplay (gdk_display);
}

View File

@ -5,7 +5,7 @@ Makefile.in
_libs
.libs
libgtk-1.1.la
testcalender
testcalendar
testgtk
testinput
testrgb

View File

@ -19,6 +19,7 @@ main (int argc, char *argv[])
window = gtk_widget_new (gtk_window_get_type (),
"GtkObject::user_data", NULL,
"GtkObject::signal::destroy", gtk_main_quit, NULL,
"GtkWindow::type", GTK_WINDOW_TOPLEVEL,
"GtkWindow::title", "hello world",
"GtkWindow::allow_grow", FALSE,

View File

@ -19,6 +19,7 @@ main (int argc, char *argv[])
window = gtk_widget_new (gtk_window_get_type (),
"GtkObject::user_data", NULL,
"GtkObject::signal::destroy", gtk_main_quit, NULL,
"GtkWindow::type", GTK_WINDOW_TOPLEVEL,
"GtkWindow::title", "hello world",
"GtkWindow::allow_grow", FALSE,