Don't generate duplicated events for clicks on tree +/- buttons.

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

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index 3f6e73d52285dd2f5245c19ed97f3bb7239d7f79..6285c011da193541af0852934042c9c8ba0ebe8c 100644 (file)
--- a/src/os2/stattext.cpp
+++ b/src/os2/stattext.cpp
@@ -131,7 +131,7 @@ wxSize wxStaticText::DoGetBestSize() const
                 if (!nHeightLineDefault)
                     nHeightLineDefault = nHeightLine;
                 if (!nHeightLineDefault)
                 if (!nHeightLineDefault)
                     nHeightLineDefault = nHeightLine;
                 if (!nHeightLineDefault)

-                    GetTextExtent(_T("W"), NULL, &nHeightLineDefault);
+                    GetTextExtent(wxT("W"), NULL, &nHeightLineDefault);

                 nHeightTextTotal += nHeightLineDefault;
             }
             else
                 nHeightTextTotal += nHeightLineDefault;
             }
             else


@@ -162,7 +162,7 @@ wxSize wxStaticText::DoGetBestSize() const
             // when it is preceded by another '~' in which case it stands for a
             // literal tilde
             //
             // when it is preceded by another '~' in which case it stands for a
             // literal tilde
             //

-            if (*pc == _T('~'))
+            if (*pc == wxT('~'))

             {
                 if (!bLastWasTilde)
                 {
             {
                 if (!bLastWasTilde)
                 {


@@ -283,7 +283,6 @@ void wxStaticText::DoSetLabel(const wxString& str)
 
 wxString wxStaticText::DoGetLabel() const
 {
 
 wxString wxStaticText::DoGetLabel() const
 {

-    // FIXME: how to retrieve the text?
-    //return wxGetWindowText(GetHWND());
+    return wxGetWindowText(GetHwnd());

 }
 
 }