X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8988cb339baf4fb5e8ebc8065e0324a9e96c208..1f77d487b7ce351b20033312a038f9bb1eb01efc:/src/os2/stattext.cpp diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp index 3f6e73d522..292f662353 100644 --- a/src/os2/stattext.cpp +++ b/src/os2/stattext.cpp @@ -24,8 +24,6 @@ #include "wx/os2/private.h" #include -IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) - bool wxStaticText::Create( wxWindow* pParent, wxWindowID vId, const wxString& rsLabel, @@ -131,7 +129,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 +160,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) { @@ -283,7 +281,6 @@ void wxStaticText::DoSetLabel(const wxString& str) wxString wxStaticText::DoGetLabel() const { - // FIXME: how to retrieve the text? - //return wxGetWindowText(GetHWND()); + return wxGetWindowText(GetHwnd()); }