X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee2ec18e88701d8f0709009616584153ca85d7a7..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/univ/textctrl.h diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h index 44cfaa4b46..941a60c21d 100644 --- a/include/wx/univ/textctrl.h +++ b/include/wx/univ/textctrl.h @@ -12,8 +12,8 @@ #ifndef _WX_UNIV_TEXTCTRL_H_ #define _WX_UNIV_TEXTCTRL_H_ -class WXDLLEXPORT wxCaret; -class WXDLLEXPORT wxTextCtrlCommandProcessor; +class WXDLLIMPEXP_FWD_CORE wxCaret; +class WXDLLIMPEXP_FWD_CORE wxTextCtrlCommandProcessor; #include "wx/scrolwin.h" // for wxScrollHelper @@ -234,9 +234,8 @@ public: virtual bool Enable(bool enable = true); // more readable flag testing methods - bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; } - bool WrapLines() const - { return !IsSingleLine() && !(GetWindowStyle() & wxHSCROLL); } + bool IsPassword() const { return HasFlag(wxTE_PASSWORD); } + bool WrapLines() const { return m_wrapLines; } // only for wxStdTextCtrlInputHandler void RefreshSelection(); @@ -500,7 +499,8 @@ private: // flags bool m_isModified:1, m_isEditable:1, - m_hasCaret:1; + m_hasCaret:1, + m_wrapLines:1; // can't be changed after creation // the rectangle (in client coordinates) to draw text inside wxRect m_rectText;