diff options
author | Matthias Clasen <mclasen@redhat.com> | 2005-08-26 18:49:52 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-08-26 18:49:52 +0000 |
commit | b3a757762cea419936be14ce6e814e9cc2511e56 (patch) | |
tree | 13e4fe1eacd3b729bec386fc97288ad62ad4a5bf /gdk/gdkintl.h | |
parent | a4df08a6c7e83d26e2ea4aca1c11b29004d7d1c4 (diff) | |
download | gtk+-b3a757762cea419936be14ce6e814e9cc2511e56.tar.gz |
Make the GdkScreen font options api public, and add properties
2005-08-26 Matthias Clasen <mclasen@redhat.com>
* gdk/gdk.symbols:
* gdk/gdkscreen.h:
* gdk/gdkscreen.c: Make the GdkScreen font options api
public, and add properties GdkScreen::font-options and
GdkScreen::resolution. (#314004)
* gdk/gdkpango.c:
* gtk/gtksettings.c:
* gtk/gtkwidget.c: Adjust all callers.
* gdk/gdkintl.h: Simplify and use glib/gi18n-lib.h.
* gdk/gdkpango.c: Include gdkintl.h, not gtkintl.h.
* gdk/gdkscreen.c: Include gdkintl.h.
Diffstat (limited to 'gdk/gdkintl.h')
-rw-r--r-- | gdk/gdkintl.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/gdk/gdkintl.h b/gdk/gdkintl.h index cfcda9d390..9bd7b267dc 100644 --- a/gdk/gdkintl.h +++ b/gdk/gdkintl.h @@ -28,25 +28,12 @@ #define __GDKINTL_H__ #include "config.h" +#include <glib/gi18n-lib.h> #ifdef ENABLE_NLS -#include<libintl.h> -#define _(String) dgettext(GETTEXT_PACKAGE,String) #define P_(String) dgettext(GETTEXT_PACKAGE "-properties",String) -#ifdef gettext_noop -#define N_(String) gettext_noop(String) #else -#define N_(String) (String) -#endif -#else /* NLS is disabled */ -#define _(String) (String) #define P_(String) (String) -#define N_(String) (String) -#define textdomain(String) (String) -#define gettext(String) (String) -#define dgettext(Domain,String) (String) -#define dcgettext(Domain,String,Type) (String) -#define bindtextdomain(Domain,Directory) (Domain) #endif #endif |