Deprecate second parameter of wxSlider::SetTickFreq().

[wxWidgets.git] / include / wx / stattext.h

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index f9e202ac1ba5c37863aa79a20ac5757e48b827dd..2a6c054b0ee96c140db68fbfef5e879399d07270 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -80,12 +80,12 @@ protected:      // functions required for wxST_ELLIPSIZE_* support
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
-    // calls only RemoveMarkup() on the original label 
+    // calls only RemoveMarkup() on the original label
     // if the wxST_MARKUP style is set
     // (but unlike GetLabelText won't remove mnemonics)
     virtual wxString GetLabelWithoutMarkup() const;
 
-    // just calls RemoveMarkup() & Ellipsize() on the original label 
+    // just calls RemoveMarkup() & Ellipsize() on the original label
     // if the wxST_MARKUP & wxST_ELLIPSIZE_* styles are set
     // (but unlike GetLabelText won't remove mnemonics)
     virtual wxString GetEllipsizedLabelWithoutMarkup() const;
@@ -99,13 +99,14 @@ protected:      // functions required for wxST_ELLIPSIZE_* support
 
     // These functions are platform-specific and must be overridden in ports
     // which do not natively support ellipsization and they must be implemented
-    // in a way so that the m_label member of wxControl is not touched:
+    // in a way so that the m_labelOrig member of wxControl is not touched:
 
     // returns the real label currently displayed inside the control.
     virtual wxString DoGetLabel() const { return wxEmptyString; }
 
     // sets the real label currently displayed inside the control,
-    // _without_ invalidating the size. The text passed is always markup-free.
+    // _without_ invalidating the size. The text passed is always markup-free
+    // but may contain the mnemonic characters.
     virtual void DoSetLabel(const wxString& WXUNUSED(str)) { }
 
 private: