X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8988cb339baf4fb5e8ebc8065e0324a9e96c208..e7bdf0ac8d2f095062b054e1adffd283c1d507a4:/src/os2/stattext.cpp diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp index 3f6e73d522..92c56f7fa9 100644 --- a/src/os2/stattext.cpp +++ b/src/os2/stattext.cpp @@ -4,7 +4,6 @@ // Author: David Webster // Modified by: // Created: 10/17/99 -// RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -24,8 +23,6 @@ #include "wx/os2/private.h" #include -IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) - bool wxStaticText::Create( wxWindow* pParent, wxWindowID vId, const wxString& rsLabel, @@ -131,7 +128,7 @@ wxSize wxStaticText::DoGetBestSize() const if (!nHeightLineDefault) nHeightLineDefault = nHeightLine; if (!nHeightLineDefault) - GetTextExtent(_T("W"), NULL, &nHeightLineDefault); + GetTextExtent(wxT("W"), NULL, &nHeightLineDefault); nHeightTextTotal += nHeightLineDefault; } else @@ -162,7 +159,7 @@ wxSize wxStaticText::DoGetBestSize() const // when it is preceded by another '~' in which case it stands for a // literal tilde // - if (*pc == _T('~')) + if (*pc == wxT('~')) { if (!bLastWasTilde) { @@ -235,9 +232,8 @@ void wxStaticText::SetLabel( { m_labelOrig = rsLabel; // save original label - // OS/2 does not support neither ellipsize nor markup in static text: - DoSetLabel(rsLabel); - DoSetLabel(GetEllipsizedLabelWithoutMarkup()); + // OS/2 does not support ellipsized labels in static text: + DoSetLabel(GetEllipsizedLabel()); // // Adjust the size of the window to fit to the label unless autoresizing is @@ -283,7 +279,6 @@ void wxStaticText::DoSetLabel(const wxString& str) wxString wxStaticText::DoGetLabel() const { - // FIXME: how to retrieve the text? - //return wxGetWindowText(GetHWND()); + return wxGetWindowText(GetHwnd()); }