From 0d0837053cd77708760d0c48a91e24ed9d6e3557 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 8 Nov 1999 15:59:33 +0000 Subject: [PATCH] small Motif compilation fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/unix/fontutil.h | 3 +-- src/motif/font.cpp | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/unix/fontutil.h b/include/wx/unix/fontutil.h index ada65aa9f3..836ed81705 100644 --- a/include/wx/unix/fontutil.h +++ b/include/wx/unix/fontutil.h @@ -13,8 +13,7 @@ #define _WX_UNIX_FONTUTIL_H_ #ifdef __X__ - struct XFontStruct; - typedef XFontStruct *wxNativeFont; + typedef WXFontStructPtr wxNativeFont; #elif defined(__WXGTK__) typedef GdkFont *wxNativeFont; #else diff --git a/src/motif/font.cpp b/src/motif/font.cpp index 10ab6faf5b..048592aeb0 100644 --- a/src/motif/font.cpp +++ b/src/motif/font.cpp @@ -360,7 +360,8 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const } // not found, create a new one - XFontStruct *font = wxLoadQueryNearestFont(pointSize, + XFontStruct *font = (XFontStruct *) + wxLoadQueryNearestFont(pointSize, M_FONTDATA->m_family, M_FONTDATA->m_style, M_FONTDATA->m_weight, -- 2.45.2