X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/733e8cf36e06e541e96334a682851dee603dffd7..2fe212b0336512aac9eace69fab09ce856b0bf4b:/src/msw/textctrl.cpp diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index f692d48578..d3b91d242b 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -200,21 +200,27 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, msStyle |= WS_VSCROLL; 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; + } - if (m_windowStyle & wxHSCROLL) - msStyle |= (WS_HSCROLL | ES_AUTOHSCROLL); + if ( m_windowStyle & wxHSCROLL ) + msStyle |= WS_HSCROLL | ES_AUTOHSCROLL; - if (m_windowStyle & wxTE_READONLY) + if ( m_windowStyle & wxTE_READONLY ) msStyle |= ES_READONLY; - if (m_windowStyle & wxTE_PASSWORD) // hidden input + if ( m_windowStyle & wxTE_PASSWORD ) msStyle |= ES_PASSWORD; - if (m_windowStyle & wxTE_AUTO_SCROLL) - msStyle |= ES_AUTOHSCROLL; + if ( m_windowStyle & wxTE_AUTO_SCROLL ) + msStyle |= ES_AUTOHSCROLL; + if ( m_windowStyle & wxTE_NOHIDESEL ) + msStyle |= ES_NOHIDESEL; // we always want the characters and the arrows m_lDlgCode = DLGC_WANTCHARS | DLGC_WANTARROWS; @@ -259,6 +265,11 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, else { msStyle |= ES_AUTOVSCROLL; + // Experimental: this seems to help with the scroll problem. See messages from Jekabs Andrushaitis + // wx-dev list, entitled "[wx-dev] wxMSW-EVT_KEY_DOWN and wxMSW-wxTextCtrl" and "[wx-dev] TextCtrl (RichEdit)" + // Unfortunately, showing the selection in blue when the control doesn't have + // the focus is non-standard behaviour, and we need to find another workaround. + //msStyle |= ES_NOHIDESEL ; m_isRich = TRUE; int ver = wxRichEditModule::GetLoadedVersion(); @@ -614,8 +625,13 @@ void wxTextCtrl::SetInsertionPoint(long pos) SendMessage(hWnd, EM_SETSEL, 0, MAKELPARAM(pos, pos)); #endif // Win32/16 - static const wxChar *nothing = _T(""); - SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing); +#if wxUSE_RICHEDIT + if ( !m_isRich) +#endif + { + static const wxChar *nothing = _T(""); + SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing); + } } void wxTextCtrl::SetInsertionPointEnd() @@ -878,6 +894,11 @@ wxString wxTextCtrl::GetLineText(long lineNo) const return str; } +void wxTextCtrl::SetMaxLength(unsigned long len) +{ + ::SendMessage(GetHwnd(), EM_LIMITTEXT, len, 0); +} + // ---------------------------------------------------------------------------- // Undo/redo // ---------------------------------------------------------------------------- @@ -928,6 +949,52 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event) } } +// ---------------------------------------------------------------------------- +// kbd input processing +// ---------------------------------------------------------------------------- + +bool wxTextCtrl::MSWShouldPreProcessMessage(WXMSG* pMsg) +{ + MSG *msg = (MSG *)pMsg; + + // check for our special keys here: if we don't do it and the parent frame + // uses them as accelerators, they wouldn't work at all, so we disable + // usual preprocessing for them + if ( msg->message == WM_KEYDOWN ) + { + WORD vkey = msg->wParam; + if ( (HIWORD(msg->lParam) & KF_ALTDOWN) == KF_ALTDOWN ) + { + if ( vkey == VK_BACK ) + return FALSE; + } + else // no Alt + { + if ( wxIsCtrlDown() ) + { + switch ( vkey ) + { + case 'C': + case 'V': + case 'X': + case VK_INSERT: + case VK_DELETE: + case VK_HOME: + case VK_END: + return FALSE; + } + } + else if ( wxIsShiftDown() ) + { + if ( vkey == VK_INSERT || vkey == VK_DELETE ) + return FALSE; + } + } + } + + return wxControl::MSWShouldPreProcessMessage(pMsg); +} + void wxTextCtrl::OnChar(wxKeyEvent& event) { switch ( event.KeyCode() ) @@ -974,8 +1041,8 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) case EN_KILLFOCUS: { wxFocusEvent event(param == EN_KILLFOCUS ? wxEVT_KILL_FOCUS - : wxEVT_SET_FOCUS, - m_windowId); + : wxEVT_SET_FOCUS, + m_windowId); event.SetEventObject( this ); GetEventHandler()->ProcessEvent(event); } @@ -992,7 +1059,13 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) case EN_MAXTEXT: // the text size limit has been hit - increase it - AdjustSpaceLimit(); + if ( !AdjustSpaceLimit() ) + { + wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, m_windowId); + InitCommandEvent(event); + event.SetString(GetValue()); + ProcessCommand(event); + } break; // the other notification messages are not processed @@ -1081,11 +1154,27 @@ void wxTextCtrl::OnEraseBackground(wxEraseEvent& event) } #endif -void wxTextCtrl::AdjustSpaceLimit() +bool wxTextCtrl::AdjustSpaceLimit() { #ifndef __WIN16__ - unsigned int len = ::GetWindowTextLength(GetHwnd()), - limit = ::SendMessage(GetHwnd(), EM_GETLIMITTEXT, 0, 0); + unsigned int limit = ::SendMessage(GetHwnd(), EM_GETLIMITTEXT, 0, 0); + + // HACK: we try to automatically extend the limit for the amount of text + // to allow (interactively) entering more than 64Kb of text under + // Win9x but we shouldn't reset the text limit which was previously + // set explicitly with SetMaxLength() + // + // we could solve this by storing the limit we set in wxTextCtrl but + // to save space we prefer to simply test here the actual limit + // value: we consider that SetMaxLength() can only be called for + // values < 32Kb + if ( limit < 0x8000 ) + { + // we've got more text than limit set by SetMaxLength() + return FALSE; + } + + unsigned int len = ::GetWindowTextLength(GetHwnd()); if ( len >= limit ) { limit = len + 0x8000; // 32Kb @@ -1110,6 +1199,9 @@ void wxTextCtrl::AdjustSpaceLimit() } } #endif // !Win16 + + // we changed the limit + return TRUE; } bool wxTextCtrl::AcceptsFocus() const