dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Win32 workaround for yasuhiro's "i18n fix" change that introduced an 

2000-01-18  Tor Lillqvist  <tml@iki.fi>

* app/text_tool.c: Add Win32 workaround for yasuhiro's "i18n fix"
change that introduced an X11 dependency.
This commit is contained in:
Tor Lillqvist 2000-01-18 23:12:26 +00:00 committed by Tor Lillqvist
parent 8681013c50
commit 5b51c7dbfe
4 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -55,6 +55,9 @@ Tue Jan 18 21:46:25 CET 2000 Sven Neumann <sven@gimp.org>
* plug-ins/winsnap/winsnap.c * plug-ins/winsnap/winsnap.c
* po-plug-ins/POTFILES.in: i18n. * po-plug-ins/POTFILES.in: i18n.
* app/text_tool.c: Add Win32 workaround for yasuhiro's "i18n fix"
change that introduced an X11 dependency.
2000-01-18 David Monniaux <monniaux@quatramaran.ens.fr> 2000-01-18 David Monniaux <monniaux@quatramaran.ens.fr>
* app/tools.c: clearer tool-tip for transform tool. * app/tools.c: clearer tool-tip for transform tool.

12
app/text_tool.c
View File

@ -20,7 +20,10 @@
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#ifndef GDK_WINDOWING_WIN32
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#endif
#include <gdk/gdkprivate.h> #include <gdk/gdkprivate.h>
@ -568,7 +571,9 @@ text_render (GimpImage *gimage,
gint width, height; gint width, height;
gint x, y, k; gint x, y, k;
void * pr; void * pr;
#ifndef GDK_WINDOWING_WIN32
XFontStruct *xfs; XFontStruct *xfs;
#endif
char *fname; char *fname;
/* determine the layer type */ /* determine the layer type */
@ -590,6 +595,7 @@ text_render (GimpImage *gimage,
/* load the font in */ /* load the font in */
gdk_error_warnings = 0; gdk_error_warnings = 0;
gdk_error_code = 0; gdk_error_code = 0;
#ifndef GDK_WINDOWING_WIN32
font = gdk_font_load (fontname); font = gdk_font_load (fontname);
xfs = GDK_FONT_XFONT(font); xfs = GDK_FONT_XFONT(font);
if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0) { if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0) {
@ -598,6 +604,12 @@ text_render (GimpImage *gimage,
font = gdk_fontset_load (fname); font = gdk_fontset_load (fname);
g_free(fname); g_free(fname);
} }
#else
/* Just use gdk_fontset_load all the time. IMHO it could be like
* this on all platforms?
*/
font = gdk_fontset_load (fontname);
#endif
gdk_error_warnings = 1; gdk_error_warnings = 1;
if (!font || (gdk_error_code == -1)) if (!font || (gdk_error_code == -1))
{ {

12
app/tools/gimptexttool.c
View File

@ -20,7 +20,10 @@
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#ifndef GDK_WINDOWING_WIN32
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#endif
#include <gdk/gdkprivate.h> #include <gdk/gdkprivate.h>
@ -568,7 +571,9 @@ text_render (GimpImage *gimage,
gint width, height; gint width, height;
gint x, y, k; gint x, y, k;
void * pr; void * pr;
#ifndef GDK_WINDOWING_WIN32
XFontStruct *xfs; XFontStruct *xfs;
#endif
char *fname; char *fname;
/* determine the layer type */ /* determine the layer type */
@ -590,6 +595,7 @@ text_render (GimpImage *gimage,
/* load the font in */ /* load the font in */
gdk_error_warnings = 0; gdk_error_warnings = 0;
gdk_error_code = 0; gdk_error_code = 0;
#ifndef GDK_WINDOWING_WIN32
font = gdk_font_load (fontname); font = gdk_font_load (fontname);
xfs = GDK_FONT_XFONT(font); xfs = GDK_FONT_XFONT(font);
if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0) { if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0) {
@ -598,6 +604,12 @@ text_render (GimpImage *gimage,
font = gdk_fontset_load (fname); font = gdk_fontset_load (fname);
g_free(fname); g_free(fname);
} }
#else
/* Just use gdk_fontset_load all the time. IMHO it could be like
* this on all platforms?
*/
font = gdk_fontset_load (fontname);
#endif
gdk_error_warnings = 1; gdk_error_warnings = 1;
if (!font || (gdk_error_code == -1)) if (!font || (gdk_error_code == -1))
{ {

12
app/tools/text_tool.c
View File

@ -20,7 +20,10 @@
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#ifndef GDK_WINDOWING_WIN32
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#endif
#include <gdk/gdkprivate.h> #include <gdk/gdkprivate.h>
@ -568,7 +571,9 @@ text_render (GimpImage *gimage,
gint width, height; gint width, height;
gint x, y, k; gint x, y, k;
void * pr; void * pr;
#ifndef GDK_WINDOWING_WIN32
XFontStruct *xfs; XFontStruct *xfs;
#endif
char *fname; char *fname;
/* determine the layer type */ /* determine the layer type */
@ -590,6 +595,7 @@ text_render (GimpImage *gimage,
/* load the font in */ /* load the font in */
gdk_error_warnings = 0; gdk_error_warnings = 0;
gdk_error_code = 0; gdk_error_code = 0;
#ifndef GDK_WINDOWING_WIN32
font = gdk_font_load (fontname); font = gdk_font_load (fontname);
xfs = GDK_FONT_XFONT(font); xfs = GDK_FONT_XFONT(font);
if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0) { if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0) {
@ -598,6 +604,12 @@ text_render (GimpImage *gimage,
font = gdk_fontset_load (fname); font = gdk_fontset_load (fname);
g_free(fname); g_free(fname);
} }
#else
/* Just use gdk_fontset_load all the time. IMHO it could be like
* this on all platforms?
*/
font = gdk_fontset_load (fontname);
#endif
gdk_error_warnings = 1; gdk_error_warnings = 1;
if (!font || (gdk_error_code == -1)) if (!font || (gdk_error_code == -1))
{ {