X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da32743f22ecdf32ff25899ea5f7abcce8d126ea..43e319a3078fffa2e361501ed2f7d04473827f12:/src/msw/textctrl.cpp diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index e92293f142..288f674d42 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -413,6 +413,7 @@ WXDWORD wxTextCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const // always adjust the vertical scrollbar automatically if we have it msStyle |= WS_VSCROLL | ES_AUTOVSCROLL; +#if wxUSE_RICHEDIT // we have to use this style for the rich edit controls because // without it the vertical scrollbar never appears at all in // richedit 3.0 because of our ECO_NOHIDESEL hack (search for it) @@ -420,6 +421,7 @@ WXDWORD wxTextCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const { msStyle |= ES_DISABLENOSCROLL; } +#endif // wxUSE_RICHEDIT } style |= wxTE_PROCESS_ENTER;