fixing osx_cocoa

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

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 7fdff2f500ff4b0a661118daf7e45386f4510d38..f7ced7f939f60492ca616d2c07906ce3fab5325b 100644 (file)
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -98,7 +98,7 @@ wxSize wxStaticText::DoGetBestClientSize() const
 {
     wxClientDC dc(const_cast<wxStaticText *>(this));
     wxFont font(GetFont());
 {
     wxClientDC dc(const_cast<wxStaticText *>(this));
     wxFont font(GetFont());

-    if (!font.Ok())
+    if (!font.IsOk())

         font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
     dc.SetFont(font);
         font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
     dc.SetFont(font);


@@ -186,10 +186,10 @@ void wxStaticText::SetLabel(const wxString& label)
 
 #ifdef SS_ENDELLIPSIS
     if ( styleReal & SS_ENDELLIPSIS )
 
 #ifdef SS_ENDELLIPSIS
     if ( styleReal & SS_ENDELLIPSIS )

-        DoSetLabel(GetLabelWithoutMarkup());
+        DoSetLabel(GetLabel());

     else
 #endif // SS_ENDELLIPSIS
     else
 #endif // SS_ENDELLIPSIS

-        DoSetLabel(GetEllipsizedLabelWithoutMarkup());
+        DoSetLabel(GetEllipsizedLabel());

 
     // adjust the size of the window to fit to the label unless autoresizing is
     // disabled
 
     // adjust the size of the window to fit to the label unless autoresizing is
     // disabled