X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/289532452089421ddadbd4726a8469511a19ab76..1ce077e25b52782f7823b7372664db76a9aa96c9:/src/msw/stattext.cpp diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp index 7fdff2f500..f7ced7f939 100644 --- a/src/msw/stattext.cpp +++ b/src/msw/stattext.cpp @@ -98,7 +98,7 @@ wxSize wxStaticText::DoGetBestClientSize() const { wxClientDC dc(const_cast(this)); wxFont font(GetFont()); - if (!font.Ok()) + if (!font.IsOk()) font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); dc.SetFont(font); @@ -186,10 +186,10 @@ void wxStaticText::SetLabel(const wxString& label) #ifdef SS_ENDELLIPSIS if ( styleReal & SS_ENDELLIPSIS ) - DoSetLabel(GetLabelWithoutMarkup()); + DoSetLabel(GetLabel()); else #endif // SS_ENDELLIPSIS - DoSetLabel(GetEllipsizedLabelWithoutMarkup()); + DoSetLabel(GetEllipsizedLabel()); // adjust the size of the window to fit to the label unless autoresizing is // disabled