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.h | |
| parent | 3a99bdf5a75710f1f4cdaf0539fc4290fc862545 (diff) | |
| download | gdk-pixbuf-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.h')
| -rw-r--r-- | gdk/gdk.h | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -63,7 +63,10 @@ void gdk_init (gint *argc, gchar ***argv); gboolean gdk_init_check (gint *argc, gchar ***argv); + +#ifdef GDK_DISABLE_DEPRECATED void gdk_exit (gint error_code); +#endif /* GDK_DISABLE_DEPRECATED */ gchar* gdk_set_locale (void); /* Push and pop error handlers for X errors @@ -77,6 +80,7 @@ void gdk_set_use_xshm (gboolean use_xshm); gboolean gdk_get_use_xshm (void); gchar* gdk_get_display (void); +#ifdef GDK_DISABLE_DEPRECATED gint gdk_input_add_full (gint source, GdkInputCondition condition, GdkInputFunction function, @@ -87,6 +91,7 @@ gint gdk_input_add (gint source, GdkInputFunction function, gpointer data); void gdk_input_remove (gint tag); +#endif /* GDK_DISABLE_DEPRECATED */ GdkGrabStatus gdk_pointer_grab (GdkWindow *window, gboolean owner_events, @@ -110,9 +115,6 @@ gint gdk_screen_height_mm (void) G_GNUC_CONST; void gdk_flush (void); void gdk_beep (void); -void gdk_key_repeat_disable (void); -void gdk_key_repeat_restore (void); - /* Rectangle utilities */ gboolean gdk_rectangle_intersect (GdkRectangle *src1, |