Caret dropout fix

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

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index 6d641a4417478b669714e459592d9c92eb4daa43..3e11757d3886900f6d9d6a68d6907a7fa04e2771 100644 (file)
--- a/src/os2/stattext.cpp
+++ b/src/os2/stattext.cpp
@@ -24,8 +24,6 @@
 #include "wx/os2/private.h"
 #include <stdio.h>
 
 #include "wx/os2/private.h"
 #include <stdio.h>
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-

 bool wxStaticText::Create( wxWindow*        pParent,
                            wxWindowID       vId,
                            const wxString&  rsLabel,
 bool wxStaticText::Create( wxWindow*        pParent,
                            wxWindowID       vId,
                            const wxString&  rsLabel,


@@ -131,7 +129,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 +160,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)
                 {


@@ -235,8 +233,8 @@ void wxStaticText::SetLabel(
 {
     m_labelOrig = rsLabel;       // save original label
 
 {
     m_labelOrig = rsLabel;       // save original label
 

-    // OS/2 does not support neither ellipsize nor markup in static text:
-    DoSetLabel(GetEllipsizedLabelWithoutMarkup(label));
+    // 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
 
     //
     // Adjust the size of the window to fit to the label unless autoresizing is


@@ -277,12 +275,11 @@ MRESULT wxStaticText::OS2WindowProc(
 void wxStaticText::DoSetLabel(const wxString& str)
 {
     wxString sLabel = ::wxPMTextToLabel(str);
 void wxStaticText::DoSetLabel(const wxString& str)
 {
     wxString sLabel = ::wxPMTextToLabel(str);

-    ::WinSetWindowText(GetHwnd(), (PSZ)sLabel.c_str());
+    ::WinSetWindowText(GetHwnd(), sLabel.c_str());

 }
 
 wxString wxStaticText::DoGetLabel() const
 {
 }
 
 wxString wxStaticText::DoGetLabel() const
 {

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

 }
 
 }