Better fix

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

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 2df67c28b877ba53c7820930b1f730876c4f481c..a3b52cac708b295275d8efa28bcc9182565aa9ea 100644 (file)
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -100,11 +100,6 @@ bool wxStaticText::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-wxBorder wxStaticText::GetDefaultBorder() const
-{
-    return wxBORDER_NONE;
-}
-

 WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);


@@ -220,9 +215,9 @@ void wxStaticText::SetLabel(const wxString& label)
     if ( HasFlag(wxST_ELLIPSIZE_END) &&
           wxGetOsVersion() == wxOS_WINDOWS_NT )
     {
     if ( HasFlag(wxST_ELLIPSIZE_END) &&
           wxGetOsVersion() == wxOS_WINDOWS_NT )
     {

-        // adding SS_ENDELLIPSIS or SS_ENDELLIPSIS "disables" the correct 
-        // newline handling in static texts: the newlines in the labels are 
-        // shown as square. Thus we don't use it even on newer OS when 
+        // adding SS_ENDELLIPSIS or SS_ENDELLIPSIS "disables" the correct
+        // newline handling in static texts: the newlines in the labels are
+        // shown as square. Thus we don't use it even on newer OS when

         // the static label contains a newline.
         if ( label.Contains(wxT('\n')) )
             styleReal &= ~SS_ENDELLIPSIS;
         // the static label contains a newline.
         if ( label.Contains(wxT('\n')) )
             styleReal &= ~SS_ENDELLIPSIS;