From: Julian Smart Date: Fri, 23 May 2003 18:56:14 +0000 (+0000) Subject: Applied patch [ 736321 ] Compile error for src/msw/textctrl.cpp X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/34433938892a8b9588269e8a20ccb6dba9a9c1b3 Applied patch [ 736321 ] Compile error for src/msw/textctrl.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- 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;