AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GDK_DISABLE_COMPAT_H, GDK_DISABLE_DEPRECATED (we need to merge those two

Browse Source 
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
This commit is contained in:
Havoc Pennington 2001-02-19 20:38:15 +00:00 committed by Havoc Pennington
parent 3a99bdf5a7
commit b58ba480af
14 changed files with 158 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -1,3 +1,22 @@
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
2001-02-16 Havoc Pennington <hp@redhat.com>
* gtk/gtkvscrollbar.c (gtk_vscrollbar_trough_keys): use the visual

19
ChangeLog.pre-2-0
View File

@ -1,3 +1,22 @@
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
2001-02-16 Havoc Pennington <hp@redhat.com>
* gtk/gtkvscrollbar.c (gtk_vscrollbar_trough_keys): use the visual

19
ChangeLog.pre-2-10
View File

@ -1,3 +1,22 @@
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
2001-02-16 Havoc Pennington <hp@redhat.com>
* gtk/gtkvscrollbar.c (gtk_vscrollbar_trough_keys): use the visual

19
ChangeLog.pre-2-2
View File

@ -1,3 +1,22 @@
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
2001-02-16 Havoc Pennington <hp@redhat.com>
* gtk/gtkvscrollbar.c (gtk_vscrollbar_trough_keys): use the visual

19
ChangeLog.pre-2-4
View File

@ -1,3 +1,22 @@
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
2001-02-16 Havoc Pennington <hp@redhat.com>
* gtk/gtkvscrollbar.c (gtk_vscrollbar_trough_keys): use the visual

19
ChangeLog.pre-2-6
View File

@ -1,3 +1,22 @@
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
2001-02-16 Havoc Pennington <hp@redhat.com>
* gtk/gtkvscrollbar.c (gtk_vscrollbar_trough_keys): use the visual

19
ChangeLog.pre-2-8
View File

@ -1,3 +1,22 @@
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
2001-02-16 Havoc Pennington <hp@redhat.com>
* gtk/gtkvscrollbar.c (gtk_vscrollbar_trough_keys): use the visual

2
demos/gtk-demo/Makefile.am
View File

@ -14,6 +14,8 @@ INCLUDES = @STRIP_BEGIN@ \
-DDEMOCODEDIR="\"$(democodedir)\"" \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-DGDK_DISABLE_COMPAT_H \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_COMPAT_H \
-DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \

12
gdk/gdk.c
View File

@ -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

8
gdk/gdk.h
View File

@ -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,

2
gdk/gdkcolor.h
View File

@ -97,6 +97,7 @@ gboolean gdk_color_equal (const GdkColor *colora,
const GdkColor *colorb);
/* The following functions are deprecated */
#ifdef GDK_DISABLE_DEPRECATED
void gdk_colors_store (GdkColormap *colormap,
GdkColor *colors,
gint ncolors);
@ -118,6 +119,7 @@ gint gdk_color_alloc (GdkColormap *colormap,
GdkColor *color);
gint gdk_color_change (GdkColormap *colormap,
GdkColor *color);
#endif /* GDK_DISABLE_DEPRECATED */
#ifdef __cplusplus
}

4
gdk/gdkfont.h
View File

@ -1,3 +1,5 @@
#ifndef GDK_DISABLE_DEPRECATED
#ifndef __GDK_FONT_H__
#define __GDK_FONT_H__
@ -100,3 +102,5 @@ void gdk_font_full_name_free (gchar *name);
#endif /* __cplusplus */
#endif /* __GDK_FONT_H__ */
#endif /* GDK_DISABLE_DEPRECATED */

3
gdk/gdkrgb.h
View File

@ -43,6 +43,7 @@ struct _GdkRgbCmap {
GSList *info_list;
};
#ifndef GDK_DISABLE_DEPRECATED
void gdk_rgb_init (void);
gulong gdk_rgb_xpixel_from_rgb (guint32 rgb) G_GNUC_CONST;
@ -50,6 +51,8 @@ void gdk_rgb_gc_set_foreground (GdkGC *gc,
guint32 rgb);
void gdk_rgb_gc_set_background (GdkGC *gc,
guint32 rgb);
#endif /* GDK_DISABLE_DEPRECATED */
void gdk_rgb_find_color (GdkColormap *colormap,
GdkColor *color);

16
gdk/x11/gdkmain-x11.c
View File

@ -598,22 +598,6 @@ gdk_set_sm_client_id (const gchar* sm_client_id)
gdk_atom_intern ("SM_CLIENT_ID", FALSE));
}
void
gdk_key_repeat_disable (void)
{
XAutoRepeatOff (gdk_display);
}
void
gdk_key_repeat_restore (void)
{
if (autorepeat)
XAutoRepeatOn (gdk_display);
else
XAutoRepeatOff (gdk_display);
}
void
gdk_beep (void)
{