small Motif compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,8 +13,7 @@
|
|||||||
#define _WX_UNIX_FONTUTIL_H_
|
#define _WX_UNIX_FONTUTIL_H_
|
||||||
|
|
||||||
#ifdef __X__
|
#ifdef __X__
|
||||||
struct XFontStruct;
|
typedef WXFontStructPtr wxNativeFont;
|
||||||
typedef XFontStruct *wxNativeFont;
|
|
||||||
#elif defined(__WXGTK__)
|
#elif defined(__WXGTK__)
|
||||||
typedef GdkFont *wxNativeFont;
|
typedef GdkFont *wxNativeFont;
|
||||||
#else
|
#else
|
||||||
|
@@ -360,7 +360,8 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
// not found, create a new one
|
// not found, create a new one
|
||||||
XFontStruct *font = wxLoadQueryNearestFont(pointSize,
|
XFontStruct *font = (XFontStruct *)
|
||||||
|
wxLoadQueryNearestFont(pointSize,
|
||||||
M_FONTDATA->m_family,
|
M_FONTDATA->m_family,
|
||||||
M_FONTDATA->m_style,
|
M_FONTDATA->m_style,
|
||||||
M_FONTDATA->m_weight,
|
M_FONTDATA->m_weight,
|
||||||
|
Reference in New Issue
Block a user