applying patch, fixes #10524

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

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index 6d641a4417478b669714e459592d9c92eb4daa43..1ee58a4b8c867543dd157eef1d5b6ebd2b8f30c5 100644 (file)
--- a/src/os2/stattext.cpp
+++ b/src/os2/stattext.cpp
@@ -236,7 +236,8 @@ void wxStaticText::SetLabel(
     m_labelOrig = rsLabel;       // save original label
 
     // OS/2 does not support neither ellipsize nor markup in static text:
     m_labelOrig = rsLabel;       // save original label
 
     // OS/2 does not support neither ellipsize nor markup in static text:

-    DoSetLabel(GetEllipsizedLabelWithoutMarkup(label));
+    DoSetLabel(rsLabel);
+    DoSetLabel(GetEllipsizedLabelWithoutMarkup());

 
     //
     // 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 +278,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());

 }
 
 }