X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12cca26a83405b5f7f29ce2c44c5f965d07ceafc..550f38d74380256da7bfcb961d40ff86f677f77e:/src/motif/menu.cpp diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp index 123a04b0cb..a65a5df03b 100644 --- a/src/motif/menu.cpp +++ b/src/motif/menu.cpp @@ -661,15 +661,15 @@ void wxMenu::ChangeFont(bool keepOriginalSize) if (!m_font.Ok() || !m_menuWidget) return; - WXFontType fontType = m_font.GetFontType(XtDisplay((Widget) m_menuWidget)); + Display* dpy = XtDisplay((Widget) m_menuWidget); XtVaSetValues ((Widget) m_menuWidget, - wxFont::GetFontTag(), fontType, + wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), NULL); if (m_buttonWidget) { XtVaSetValues ((Widget) m_buttonWidget, - wxFont::GetFontTag(), fontType, + wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), NULL); } @@ -681,7 +681,7 @@ void wxMenu::ChangeFont(bool keepOriginalSize) if (m_menuWidget && item->GetButtonWidget() && m_font.Ok()) { XtVaSetValues ((Widget) item->GetButtonWidget(), - wxFont::GetFontTag(), fontType, + wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), NULL); } if (item->GetSubMenu())