Added wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT to fix tree and list control selection rendering.

[wxWidgets.git] / src / os2 / stattext.cpp

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index dc70b334f5b93ccec791be236c27d01f2db15b87..292f6623534ee0085be08854d5aeff9eb1c794f7 100644 (file)
--- a/src/os2/stattext.cpp
+++ b/src/os2/stattext.cpp
@@ -24,8 +24,6 @@
 #include "wx/os2/private.h"
 #include <stdio.h>
 
-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());
 }