Check also $CC for -fnative-struct before adding it, to avoid (harmless)
2001-10-28 Tor Lillqvist <tml@iki.fi> * configure.in: Check also $CC for -fnative-struct before adding it, to avoid (harmless) duplication. * gdk/gdkconfig.h.win32: Use configure-generated version. * gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Recognize also the tcvn and tis620.2533 registries as indicating Vietnamese and Thai charsets respectively. Also recognize "windows" or "microsoft" registry with "vietnamese" or "thai" encoding. * gtk/gtkrc.zh_TW.Big5: Delete, no need for encoding as part of the locale name on Win32, as GTK uses Unicode. * gtk/gtkrc.zh_TW: Add this instead. * gtk/Makefile.am: Corresponding change. * gtk/Makefile.am (install-data-local): Cannot use symbolic links for gtkrc files. The non-cygwin gtk dll doesn't understand Cygwin symbolic links. * gtk/gtkrc.zh_CN: Look for the SimHei font. Otherwise we get a match in Tahoma or somesuch, which claims to support the GB2312_CHARSET, even if it doesn't.
This commit is contained in:
Tor Lillqvist
committed by
Tor Lillqvist
Tor Lillqvist
parent
b350c23671
commit
50e2e00899
27
ChangeLog
27
ChangeLog
@@ -1,3 +1,30 @@
|
||||
2001-10-28 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Check also $CC for -fnative-struct before adding
|
||||
it, to avoid (harmless) duplication.
|
||||
|
||||
* gdk/gdkconfig.h.win32: Use configure-generated version.
|
||||
|
||||
* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Recognize
|
||||
also the tcvn and tis620.2533 registries as indicating Vietnamese
|
||||
and Thai charsets respectively. Also recognize "windows" or
|
||||
"microsoft" registry with "vietnamese" or "thai" encoding.
|
||||
|
||||
* gtk/gtkrc.zh_TW.Big5: Delete, no need for encoding as part of
|
||||
the locale name on Win32, as GTK uses Unicode.
|
||||
|
||||
* gtk/gtkrc.zh_TW: Add this instead.
|
||||
|
||||
* gtk/Makefile.am: Corresponding change.
|
||||
|
||||
* gtk/Makefile.am (install-data-local): Cannot use symbolic links
|
||||
for gtkrc files. The non-cygwin gtk dll doesn't understand Cygwin
|
||||
symbolic links.
|
||||
|
||||
* gtk/gtkrc.zh_CN: Look for the SimHei font. Otherwise we get a
|
||||
match in Tahoma or somesuch, which claims to support the
|
||||
GB2312_CHARSET, even if it doesn't.
|
||||
|
||||
2001-10-25 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk-1.3-win32-production.pc.in: Use just @prefix@.
|
||||
|
||||
@@ -1,3 +1,30 @@
|
||||
2001-10-28 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Check also $CC for -fnative-struct before adding
|
||||
it, to avoid (harmless) duplication.
|
||||
|
||||
* gdk/gdkconfig.h.win32: Use configure-generated version.
|
||||
|
||||
* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Recognize
|
||||
also the tcvn and tis620.2533 registries as indicating Vietnamese
|
||||
and Thai charsets respectively. Also recognize "windows" or
|
||||
"microsoft" registry with "vietnamese" or "thai" encoding.
|
||||
|
||||
* gtk/gtkrc.zh_TW.Big5: Delete, no need for encoding as part of
|
||||
the locale name on Win32, as GTK uses Unicode.
|
||||
|
||||
* gtk/gtkrc.zh_TW: Add this instead.
|
||||
|
||||
* gtk/Makefile.am: Corresponding change.
|
||||
|
||||
* gtk/Makefile.am (install-data-local): Cannot use symbolic links
|
||||
for gtkrc files. The non-cygwin gtk dll doesn't understand Cygwin
|
||||
symbolic links.
|
||||
|
||||
* gtk/gtkrc.zh_CN: Look for the SimHei font. Otherwise we get a
|
||||
match in Tahoma or somesuch, which claims to support the
|
||||
GB2312_CHARSET, even if it doesn't.
|
||||
|
||||
2001-10-25 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk-1.3-win32-production.pc.in: Use just @prefix@.
|
||||
|
||||
@@ -1,3 +1,30 @@
|
||||
2001-10-28 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Check also $CC for -fnative-struct before adding
|
||||
it, to avoid (harmless) duplication.
|
||||
|
||||
* gdk/gdkconfig.h.win32: Use configure-generated version.
|
||||
|
||||
* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Recognize
|
||||
also the tcvn and tis620.2533 registries as indicating Vietnamese
|
||||
and Thai charsets respectively. Also recognize "windows" or
|
||||
"microsoft" registry with "vietnamese" or "thai" encoding.
|
||||
|
||||
* gtk/gtkrc.zh_TW.Big5: Delete, no need for encoding as part of
|
||||
the locale name on Win32, as GTK uses Unicode.
|
||||
|
||||
* gtk/gtkrc.zh_TW: Add this instead.
|
||||
|
||||
* gtk/Makefile.am: Corresponding change.
|
||||
|
||||
* gtk/Makefile.am (install-data-local): Cannot use symbolic links
|
||||
for gtkrc files. The non-cygwin gtk dll doesn't understand Cygwin
|
||||
symbolic links.
|
||||
|
||||
* gtk/gtkrc.zh_CN: Look for the SimHei font. Otherwise we get a
|
||||
match in Tahoma or somesuch, which claims to support the
|
||||
GB2312_CHARSET, even if it doesn't.
|
||||
|
||||
2001-10-25 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk-1.3-win32-production.pc.in: Use just @prefix@.
|
||||
|
||||
@@ -1,3 +1,30 @@
|
||||
2001-10-28 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Check also $CC for -fnative-struct before adding
|
||||
it, to avoid (harmless) duplication.
|
||||
|
||||
* gdk/gdkconfig.h.win32: Use configure-generated version.
|
||||
|
||||
* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Recognize
|
||||
also the tcvn and tis620.2533 registries as indicating Vietnamese
|
||||
and Thai charsets respectively. Also recognize "windows" or
|
||||
"microsoft" registry with "vietnamese" or "thai" encoding.
|
||||
|
||||
* gtk/gtkrc.zh_TW.Big5: Delete, no need for encoding as part of
|
||||
the locale name on Win32, as GTK uses Unicode.
|
||||
|
||||
* gtk/gtkrc.zh_TW: Add this instead.
|
||||
|
||||
* gtk/Makefile.am: Corresponding change.
|
||||
|
||||
* gtk/Makefile.am (install-data-local): Cannot use symbolic links
|
||||
for gtkrc files. The non-cygwin gtk dll doesn't understand Cygwin
|
||||
symbolic links.
|
||||
|
||||
* gtk/gtkrc.zh_CN: Look for the SimHei font. Otherwise we get a
|
||||
match in Tahoma or somesuch, which claims to support the
|
||||
GB2312_CHARSET, even if it doesn't.
|
||||
|
||||
2001-10-25 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk-1.3-win32-production.pc.in: Use just @prefix@.
|
||||
|
||||
@@ -1,3 +1,30 @@
|
||||
2001-10-28 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Check also $CC for -fnative-struct before adding
|
||||
it, to avoid (harmless) duplication.
|
||||
|
||||
* gdk/gdkconfig.h.win32: Use configure-generated version.
|
||||
|
||||
* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Recognize
|
||||
also the tcvn and tis620.2533 registries as indicating Vietnamese
|
||||
and Thai charsets respectively. Also recognize "windows" or
|
||||
"microsoft" registry with "vietnamese" or "thai" encoding.
|
||||
|
||||
* gtk/gtkrc.zh_TW.Big5: Delete, no need for encoding as part of
|
||||
the locale name on Win32, as GTK uses Unicode.
|
||||
|
||||
* gtk/gtkrc.zh_TW: Add this instead.
|
||||
|
||||
* gtk/Makefile.am: Corresponding change.
|
||||
|
||||
* gtk/Makefile.am (install-data-local): Cannot use symbolic links
|
||||
for gtkrc files. The non-cygwin gtk dll doesn't understand Cygwin
|
||||
symbolic links.
|
||||
|
||||
* gtk/gtkrc.zh_CN: Look for the SimHei font. Otherwise we get a
|
||||
match in Tahoma or somesuch, which claims to support the
|
||||
GB2312_CHARSET, even if it doesn't.
|
||||
|
||||
2001-10-25 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk-1.3-win32-production.pc.in: Use just @prefix@.
|
||||
|
||||
@@ -1,3 +1,30 @@
|
||||
2001-10-28 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Check also $CC for -fnative-struct before adding
|
||||
it, to avoid (harmless) duplication.
|
||||
|
||||
* gdk/gdkconfig.h.win32: Use configure-generated version.
|
||||
|
||||
* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Recognize
|
||||
also the tcvn and tis620.2533 registries as indicating Vietnamese
|
||||
and Thai charsets respectively. Also recognize "windows" or
|
||||
"microsoft" registry with "vietnamese" or "thai" encoding.
|
||||
|
||||
* gtk/gtkrc.zh_TW.Big5: Delete, no need for encoding as part of
|
||||
the locale name on Win32, as GTK uses Unicode.
|
||||
|
||||
* gtk/gtkrc.zh_TW: Add this instead.
|
||||
|
||||
* gtk/Makefile.am: Corresponding change.
|
||||
|
||||
* gtk/Makefile.am (install-data-local): Cannot use symbolic links
|
||||
for gtkrc files. The non-cygwin gtk dll doesn't understand Cygwin
|
||||
symbolic links.
|
||||
|
||||
* gtk/gtkrc.zh_CN: Look for the SimHei font. Otherwise we get a
|
||||
match in Tahoma or somesuch, which claims to support the
|
||||
GB2312_CHARSET, even if it doesn't.
|
||||
|
||||
2001-10-25 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk-1.3-win32-production.pc.in: Use just @prefix@.
|
||||
|
||||
@@ -1,3 +1,30 @@
|
||||
2001-10-28 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* configure.in: Check also $CC for -fnative-struct before adding
|
||||
it, to avoid (harmless) duplication.
|
||||
|
||||
* gdk/gdkconfig.h.win32: Use configure-generated version.
|
||||
|
||||
* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Recognize
|
||||
also the tcvn and tis620.2533 registries as indicating Vietnamese
|
||||
and Thai charsets respectively. Also recognize "windows" or
|
||||
"microsoft" registry with "vietnamese" or "thai" encoding.
|
||||
|
||||
* gtk/gtkrc.zh_TW.Big5: Delete, no need for encoding as part of
|
||||
the locale name on Win32, as GTK uses Unicode.
|
||||
|
||||
* gtk/gtkrc.zh_TW: Add this instead.
|
||||
|
||||
* gtk/Makefile.am: Corresponding change.
|
||||
|
||||
* gtk/Makefile.am (install-data-local): Cannot use symbolic links
|
||||
for gtkrc files. The non-cygwin gtk dll doesn't understand Cygwin
|
||||
symbolic links.
|
||||
|
||||
* gtk/gtkrc.zh_CN: Look for the SimHei font. Otherwise we get a
|
||||
match in Tahoma or somesuch, which claims to support the
|
||||
GB2312_CHARSET, even if it doesn't.
|
||||
|
||||
2001-10-25 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk-1.3-win32-production.pc.in: Use just @prefix@.
|
||||
|
||||
@@ -165,7 +165,7 @@ if test "x$GCC" = "xyes"; then
|
||||
fi
|
||||
|
||||
if test "$os_win32" = "yes"; then
|
||||
case " $CFLAGS " in
|
||||
case "$CC $CFLAGS " in
|
||||
*[[\ \ ]]-fnative-struct[[\ \ ]]*) ;;
|
||||
*) CFLAGS="$CFLAGS -fnative-struct" ;;
|
||||
esac
|
||||
|
||||
@@ -1,9 +1,24 @@
|
||||
/* Handcrafted for Win32 */
|
||||
/* gdkconfig.h
|
||||
*
|
||||
* This is a generated file. Please modify `configure.in'
|
||||
*/
|
||||
|
||||
#ifndef GDKCONFIG_H
|
||||
#define GDKCONFIG_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
|
||||
#define GDK_WINDOWING_WIN32
|
||||
#define GDK_HAVE_WCHAR_H 1
|
||||
#ifdef _MSC_VER
|
||||
#define GDK_HAVE_WCTYPE_H 1
|
||||
#endif
|
||||
#define GDK_USE_UTF8_MBS 1
|
||||
#define GDK_USE_UTF8_MBS
|
||||
|
||||
#define GDK_HAVE_WCHAR_H 1
|
||||
#define GDK_HAVE_WCTYPE_H 1
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* GDKCONFIG_H */
|
||||
|
||||
@@ -1348,6 +1348,11 @@ gdk_font_load_internal (GdkFont* font_set,
|
||||
fdwCharSet = GB2312_CHARSET;
|
||||
else if (g_strcasecmp (registry, "big5") == 0)
|
||||
fdwCharSet = CHINESEBIG5_CHARSET;
|
||||
else if (g_strcasecmp (registry, "tcvn") == 0
|
||||
&& strcmp (encoding, "5712") == 0)
|
||||
fdwCharSet = VIETNAMESE_CHARSET;
|
||||
else if (g_strcasecmp (registry, "tis620.2533") == 0)
|
||||
fdwCharSet = THAI_CHARSET;
|
||||
else if (g_strcasecmp (registry, "windows") == 0
|
||||
|| g_strcasecmp (registry, "microsoft") == 0)
|
||||
if (g_strcasecmp (encoding, "symbol") == 0)
|
||||
@@ -1370,6 +1375,10 @@ gdk_font_load_internal (GdkFont* font_set,
|
||||
fdwCharSet = GREEK_CHARSET;
|
||||
else if (g_strcasecmp (encoding, "turkish") == 0)
|
||||
fdwCharSet = TURKISH_CHARSET;
|
||||
else if (g_strcasecmp (encoding, "vietnamese") == 0)
|
||||
fdwCharSet = VIETNAMESE_CHARSET;
|
||||
else if (g_strcasecmp (encoding, "thai") == 0)
|
||||
fdwCharSet = THAI_CHARSET;
|
||||
else if (g_strcasecmp (encoding, "easteurope") == 0)
|
||||
fdwCharSet = EASTEUROPE_CHARSET;
|
||||
else if (g_strcasecmp (encoding, "russian") == 0)
|
||||
|
||||
@@ -433,7 +433,7 @@ gtkconfdir = $(sysconfdir)/gtk
|
||||
gtkconf_DATA = gtkrc.bg gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja \
|
||||
gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 \
|
||||
gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
|
||||
gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.Big5 \
|
||||
gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW \
|
||||
gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \
|
||||
gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii
|
||||
|
||||
@@ -446,22 +446,22 @@ install-data-local: install-data-local-ms-lib install-data-local-libtool-import-
|
||||
cd $(DESTDIR)$(gtkconfdir) && \
|
||||
for i in cs hr hu pl ro sk sl sq ; do \
|
||||
rm -f gtkrc.$$i ; \
|
||||
ln -s gtkrc.iso-8859-2 gtkrc.$$i ; \
|
||||
cp gtkrc.iso-8859-2 gtkrc.$$i ; \
|
||||
done ; \
|
||||
for i in bg_BG.iso88595 mk sr ru_RU.iso88595 ; do \
|
||||
rm -f gtkrc.$$i ; \
|
||||
ln -s gtkrc.iso-8859-5 gtkrc.$$i ; \
|
||||
cp gtkrc.iso-8859-5 gtkrc.$$i ; \
|
||||
done ; \
|
||||
rm -f gtkrc.lt gtkrc.cy gtkrc.ga gtkrc.et gtkrc.ka \
|
||||
gtkrc.vi_VN.viscii111 gtkrc.vi_VN.tcvn5712 gtkrc.vi ; \
|
||||
ln -s gtkrc.iso-8859-13 gtkrc.lt ; \
|
||||
ln -s gtkrc.iso-8859-14 gtkrc.cy ; \
|
||||
ln -s gtkrc.iso-8859-14 gtkrc.ga ; \
|
||||
ln -s gtkrc.iso-8859-15 gtkrc.et ; \
|
||||
ln -s gtkrc.ka_GE.georgianacademy gtkrc.ka ; \
|
||||
ln -s gtkrc.vi_VN.viscii gtkrc.vi_VN.viscii111 ; \
|
||||
ln -s gtkrc.vi_VN.tcvn gtkrc.vi_VN.tcvn5712 ; \
|
||||
ln -s gtkrc.vi_VN.tcvn5712 gtkrc.vi
|
||||
cp gtkrc.iso-8859-13 gtkrc.lt ; \
|
||||
cp gtkrc.iso-8859-14 gtkrc.cy ; \
|
||||
cp gtkrc.iso-8859-14 gtkrc.ga ; \
|
||||
cp gtkrc.iso-8859-15 gtkrc.et ; \
|
||||
cp gtkrc.ka_GE.georgianacademy gtkrc.ka ; \
|
||||
cp gtkrc.vi_VN.viscii gtkrc.vi_VN.viscii111 ; \
|
||||
cp gtkrc.vi_VN.tcvn gtkrc.vi_VN.tcvn5712 ; \
|
||||
cp gtkrc.vi_VN.tcvn5712 gtkrc.vi
|
||||
|
||||
uninstall-local: uninstall-local-ms-lib uninstall-local-libtool-import-lib
|
||||
rm -f $(DESTDIR)$(datadir)/themes/Default/gtkrc
|
||||
|
||||
@@ -287,6 +287,7 @@ gtk_init_check (int *argc,
|
||||
if (!gdk_init_check (argc, argv))
|
||||
return FALSE;
|
||||
|
||||
|
||||
gdk_event_handler_set ((GdkEventFunc)gtk_main_do_event, NULL, NULL);
|
||||
|
||||
#ifdef G_ENABLE_DEBUG
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
style "gtk-default-zh-cn" {
|
||||
fontset = "-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-*,\
|
||||
-*-*-medium-r-normal--14-*-*-*-*-*-gb2312.1980-0"
|
||||
-*-simhei-medium-r-normal--14-*-*-*-*-*-gb2312.1980-0"
|
||||
}
|
||||
class "GtkWidget" style "gtk-default-zh-cn"
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
style "gtk-default-zh-tw" {
|
||||
fontset = "-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-*,\
|
||||
-*-*-medium-r-normal--14-*-*-*-*-*-big5-0"
|
||||
-*-mingliu-medium-r-normal--14-*-*-*-*-*-big5-0"
|
||||
}
|
||||
class "GtkWidget" style "gtk-default-zh-tw"
|
||||
|
||||
@@ -8554,6 +8554,7 @@ main (int argc, char *argv[])
|
||||
/* bindings test
|
||||
*/
|
||||
binding_set = gtk_binding_set_by_class (gtk_type_class (GTK_TYPE_WIDGET));
|
||||
|
||||
gtk_binding_entry_add_signal (binding_set,
|
||||
'9', GDK_CONTROL_MASK | GDK_RELEASE_MASK,
|
||||
"debug_msg",
|
||||
|
||||
@@ -1,3 +1,9 @@
|
||||
2001-10-28 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* makefile.cygwin: Change the Content-Type: header to
|
||||
charset=UTF-8 after converting to UTF-8. Remove superfluos rules
|
||||
for Chinese.
|
||||
|
||||
2000-10-07 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
Change from the 2000-10-07 snapshot:
|
||||
|
||||
@@ -14,14 +14,10 @@
|
||||
ifndef PACKAGE
|
||||
PACKAGE = gtk+
|
||||
endif
|
||||
ifndef INSTALLSUBDIR
|
||||
INSTALLSUBDIR = $(PACKAGE)
|
||||
endif
|
||||
ifndef LOCALEDIR
|
||||
# This is what I use as installation target, from where the installer-builder
|
||||
# will pick it up. The user installation location will be asked by
|
||||
# the installer (typically %WinDir%\gtk+).
|
||||
LOCALEDIR = /install/$(INSTALLSUBDIR)/locale
|
||||
# This is what I use as installation target, from where installer-builders
|
||||
# or zip file creating scripts will pick it up.
|
||||
LOCALEDIR = /target/lib/locale
|
||||
endif
|
||||
|
||||
LANGUAGES = $(subst .po,,$(wildcard *.po))
|
||||
@@ -39,7 +35,9 @@ install : all
|
||||
.SUFFIXES: .po .utf8 .gmo
|
||||
|
||||
.utf8.gmo:
|
||||
msgfmt -o $@ $<
|
||||
sed -e 's,^"Content-Type: text/plain; charset=.*\\n","Content-Type: text/plain; charset=UTF-8\\n",' <$< >$<.xxx
|
||||
msgfmt -o $@ $<.xxx
|
||||
rm -f $<.xxx
|
||||
|
||||
ca.utf8: ca.po
|
||||
iconv -f ISO-8859-1 -t UTF-8 ca.po >$@
|
||||
@@ -137,15 +135,9 @@ tr.utf8: tr.po
|
||||
wa.utf8: wa.po
|
||||
iconv -f ISO-8859-1 -t UTF-8 wa.po >$@
|
||||
|
||||
zh_CN.gmo: zh_CN.utf8
|
||||
msgfmt -o $@ $<
|
||||
|
||||
zh_CN.utf8: zh_CN.GB2312.po
|
||||
iconv -f GB2312 -t UTF-8 zh_CN.GB2312.po >$@
|
||||
|
||||
zh_TW.gmo: zh_TW.utf8
|
||||
msgfmt -o $@ $<
|
||||
|
||||
zh_TW.utf8: zh_TW.Big5.po
|
||||
iconv -f BIG5 -t UTF-8 zh_TW.Big5.po >$@
|
||||
|
||||
|
||||
Reference in New Issue
Block a user