diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-02-19 20:38:15 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-02-19 20:38:15 +0000 |
| commit | b58ba480af3de8e620653d4ee519eaf63ea78b88 (patch) | |
| tree | 29de1fc8818f775db8290ac12ed5a6b3cb2b2938 /gdk/gdk.c | |
| parent | 3a99bdf5a75710f1f4cdaf0539fc4290fc862545 (diff) | |
| download | gtk+-b58ba480af3de8e620653d4ee519eaf63ea78b88.tar.gz | |
GDK_DISABLE_COMPAT_H, GDK_DISABLE_DEPRECATED (we need to merge those two
2001-02-19 Havoc Pennington <hp@redhat.com>
* demos/gtk-demo/Makefile.am (INCLUDES): GDK_DISABLE_COMPAT_H,
GDK_DISABLE_DEPRECATED (we need to merge those two #defines)
* gdk/x11/gdkmain-x11.c (gdk_key_repeat_disable): nuke
(gdk_key_repeat_restore): nuke
* gdk/gdk.c (gdk_exit_func): #if 0 this for now, don't install it
(gdk_init_check): no atexit func
* gdk/gdkrgb.h: mark some stuff deprecated
* gdk/gdkcolor.h: mark some stuff deprecated
* gdk/gdk.h: deprecated gdk_exit, gdk_input_*
* gdk/gdkfont.h: bracket in GDK_DISABLE_DEPRECATED
Diffstat (limited to 'gdk/gdk.c')
| -rw-r--r-- | gdk/gdk.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -54,7 +54,6 @@ struct _GdkErrorTrap /* * Private function declarations */ -static void gdk_exit_func (void); GdkFilterReturn gdk_wm_protocols_filter (GdkXEvent *xev, GdkEvent *event, @@ -334,8 +333,6 @@ gdk_init_check (int *argc, if (!result) return FALSE; - g_atexit (gdk_exit_func); - gdk_events_init (); gdk_visual_init (); _gdk_windowing_window_init (); @@ -389,6 +386,13 @@ gdk_exit (gint errorcode) exit (errorcode); } +#if 0 + +/* This is disabled, but the code isn't removed, because we might + * want to have some sort of explicit way to shut down GDK cleanly + * at some point in the future. + */ + /* *-------------------------------------------------------------- * gdk_exit_func @@ -436,6 +440,8 @@ gdk_exit_func (void) } } +#endif + /************************************************************* * gdk_error_trap_push: * Push an error trap. X errors will be trapped until |