From a4bacadeb2bf081d4d9911af2505ec06f17eb2a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Karsten=20Ball=C3=BCder?= Date: Fri, 12 Nov 1999 16:31:33 +0000 Subject: [PATCH] fixed endless recursion for loading of default font git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/fontutil.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index 8bdd44191e..be3861a149 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -61,7 +61,17 @@ #elif defined(__WXGTK__) static inline wxNativeFont wxLoadFont(const wxString& fontSpec) { - return gdk_font_load( wxConvertWX2MB(fontSpec) ); + wxNativeFont font = gdk_font_load( wxConvertWX2MB(fontSpec) ); + if(fontSpec == "-*-*-*-*-*-*-*-*-*-*-*-*-*-*") + { + if(font == NULL) + font = gdk_font_load (wxConvertWX2MB("-*-*-*-*-*-*-*-*-75-*-*-*-*-*")); + if(font == NULL) + font = gdk_font_load (wxConvertWX2MB("-*-*-*-*-*-*-*-*-100-*-*-*-*-*")); + if(font == NULL) + font = gdk_font_load (wxConvertWX2MB("-*-fixed-*-*-*-*-*-*-*-*-*-*-*-*")); + } + return font; } static inline void wxFreeFont(wxNativeFont font) -- 2.47.2