diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-09-11 20:24:40 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-09-11 20:24:40 +0000 |
| commit | 69915aa7104beebdcfbc6d42592481843069c403 (patch) | |
| tree | 933c4c9172a34de05399eb080a541c0bd6254979 /gdk/x11/gdkx.h | |
| parent | 13ff590365e84e5470c72bf42bab98177fbc167f (diff) | |
| download | gtk+-69915aa7104beebdcfbc6d42592481843069c403.tar.gz | |
Implement a search path for GTK+ modules.
Sat Sep 8 16:19:02 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmain.c: Implement a search path for GTK+ modules.
* configure.in gtk/gtkrc.c gtk/Makefile.am: Look for modules
in gtk-2.0/<type>/major.minor.(micro-binary_age) rather
than in gtk-2.0/major.minor.micro/<type>/. This
works better for a search path for modules.
* gtk+-2.0.pc.in gtk+-2.0-uninstalled.pc.in: Add
gtk_binary_version variable holding major.minor.(micro-binary_age).
* modules/input/Makefile.am (moduledir): Fix installation
directory to match change in lookup location.
* gtk/gtkmain.c (gtk_init_check): Remove OS/2 code for dll
suffixes. Needs to be handled in g_module_build_path().
* gtk/gtkrc.c gtk/queryimmodules.c: Use g_build_filename() where
appropriate.
Diffstat (limited to 'gdk/x11/gdkx.h')
| -rw-r--r-- | gdk/x11/gdkx.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h index 00b57f4a1e..2f61dfdc3b 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -125,8 +125,9 @@ gboolean gdk_net_wm_supports (GdkAtom property); #ifndef GDK_DISABLE_DEPRECATED -Display *gdk_x11_font_get_xdisplay (GdkFont *font); -gpointer gdk_x11_font_get_xfont (GdkFont *font); +Display * gdk_x11_font_get_xdisplay (GdkFont *font); +gpointer gdk_x11_font_get_xfont (GdkFont *font); +G_CONST_RETURN char *gdk_x11_font_get_name (GdkFont *font); #define GDK_FONT_XDISPLAY(font) (gdk_x11_font_get_xdisplay (font)) #define GDK_FONT_XFONT(font) (gdk_x11_font_get_xfont (font)) |