X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/115de22f78ff3394ca39c04b01a684244e38b1b1..2e7352635eafb61347bd245655d80b10bf27ac6d:/src/os2/stattext.cpp diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp index dc70b334f5..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,10 +281,6 @@ void wxStaticText::DoSetLabel(const wxString& str) wxString wxStaticText::DoGetLabel() const { - HWND hwnd = GetHwnd(); - LONG textLen = ::WinQueryWindowTextLength(hwnd); - wxCharBuffer buffer(textLen+1); - ::WinQueryWindowText(hwnd, textLen+1, buffer.data()); - return buffer; + return wxGetWindowText(GetHwnd()); }