Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added and documented wxTE_NOHIDESEL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-10-18 00:53:35 +00:00
parent 4fcf087dda
commit 5a8f04e382
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/latex/wx/text.tex
View File

@@ -36,6 +36,9 @@ style is ignored under other platforms.}
\twocolitem{\windowstyle{wxTE\_AUTO\_URL}}{Highlight the URLs and generate the \twocolitem{\windowstyle{wxTE\_AUTO\_URL}}{Highlight the URLs and generate the
wxTextUrlEvents when mouse events occur over them. This style is supported wxTextUrlEvents when mouse events occur over them. This style is supported
under Win32 only and requires wxTE\_RICH.} under Win32 only and requires wxTE\_RICH.}
\twocolitem{\windowstyle{wxTE\_NOHIDESEL}}{By default, the Windows text control
doesn't show the selection when it doesn't have focus - use this style to force
it to always show it. It doesn't do anything under other platforms.}
\twocolitem{\windowstyle{wxHSCROLL}}{A horizontal scrollbar will be created. No effect under GTK+.} \twocolitem{\windowstyle{wxHSCROLL}}{A horizontal scrollbar will be created. No effect under GTK+.}
\end{twocollist} \end{twocollist}

4
include/wx/textctrl.h
View File

@@ -84,6 +84,10 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
// this is for Win32 richedit controls only so far // this is for Win32 richedit controls only so far
#define wxTE_AUTO_URL 0x1000 #define wxTE_AUTO_URL 0x1000
// by default, the Windows text control doesn't show the selection when it
// doesn't have focus - use this style to force it to always show it
#define wxTE_NOHIDESEL 0x2000
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxTextAttr: a structure containing the visual attributes of a text // wxTextAttr: a structure containing the visual attributes of a text
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

20
src/msw/textctrl.cpp
View File

@@ -200,21 +200,27 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
msStyle |= WS_VSCROLL; msStyle |= WS_VSCROLL;
m_windowStyle |= wxTE_PROCESS_ENTER; m_windowStyle |= wxTE_PROCESS_ENTER;
} }
else else // !multiline
{
// there is really no reason to not have this style for single line
// text controls
msStyle |= ES_AUTOHSCROLL; msStyle |= ES_AUTOHSCROLL;
}
if (m_windowStyle & wxHSCROLL) if ( m_windowStyle & wxHSCROLL )
msStyle |= (WS_HSCROLL | ES_AUTOHSCROLL); msStyle |= WS_HSCROLL | ES_AUTOHSCROLL;
if (m_windowStyle & wxTE_READONLY) if ( m_windowStyle & wxTE_READONLY )
msStyle |= ES_READONLY; msStyle |= ES_READONLY;
if (m_windowStyle & wxTE_PASSWORD) // hidden input if ( m_windowStyle & wxTE_PASSWORD )
msStyle |= ES_PASSWORD; msStyle |= ES_PASSWORD;
if (m_windowStyle & wxTE_AUTO_SCROLL) if ( m_windowStyle & wxTE_AUTO_SCROLL )
msStyle |= ES_AUTOHSCROLL; msStyle |= ES_AUTOHSCROLL;
if ( m_windowStyle & wxTE_NOHIDESEL )
msStyle |= ES_NOHIDESEL;
// we always want the characters and the arrows // we always want the characters and the arrows
m_lDlgCode = DLGC_WANTCHARS | DLGC_WANTARROWS; m_lDlgCode = DLGC_WANTCHARS | DLGC_WANTARROWS;