merging r60138

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_9_0_BRANCH@60195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-16 09:48:05 +00:00
parent 97badc2a86
commit a5f93241ff
3 changed files with 32 additions and 3 deletions
--- a/interface/wx/textctrl.h
+++ b/interface/wx/textctrl.h
@@ -863,7 +863,9 @@ public:
           instead. For the control created with this style, you can still use
           Ctrl-Enter to pass to the next control from the keyboard.
    @style{wxTE_MULTILINE}
-           The text control allows multiple lines.
+           The text control allows multiple lines. If this style is not
+           specified, line break characters should not be used in the controls
+           value.
    @style{wxTE_PASSWORD}
           The text will be echoed as asterisks.
    @style{wxTE_READONLY}