Skip to content

Commit

Permalink
Remove duplicate XLoadQueryFontNoXError() function.
Browse files Browse the repository at this point in the history
  • Loading branch information
fvogelnew1 committed Jan 3, 2025
1 parent 75ad843 commit e9b0040
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions unix/tkUnixFont.c
Original file line number Diff line number Diff line change
Expand Up @@ -253,33 +253,6 @@ static int SeenName(const char *name, Tcl_DString *dsPtr);
*-------------------------------------------------------------------------
*/

static XFontStruct *
XLoadQueryFontNoXError(Display *display, char *name)
{
XFontStruct *fontStructPtr = NULL;
Tk_ErrorHandler handler;

/* 45 is the major opcode of X_OpenFont */
handler = Tk_CreateErrorHandler(display, BadValue, 45, -1, NULL, NULL);
fontStructPtr = XLoadQueryFont(display, name);
Tk_DeleteErrorHandler(handler);
return fontStructPtr;
}

/*
*-------------------------------------------------------------------------
*
* XLoadQueryFontNoXError --
*
* This function is XLoadQueryFont wrapped in a NULL error handler.
* It is a temporary workaround for ticket [36e379c01b],
* "macOS Ventura, X11 build with XQuartz: crash in XLoadQueryFont",
* which actually is issue #216 in XQuartz:
* https://github.com/XQuartz/XQuartz/issues/216
*
*-------------------------------------------------------------------------
*/

static XFontStruct *
XLoadQueryFontNoXError(Display *display, char *name)
{
Expand Down

0 comments on commit e9b0040

Please sign in to comment.