X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8215f84b5cff86bbde09f31a5e1f8e1d96025e07..94e2ed3b8db0220160c0b939782cd46914ec073a:/src/msw/textctrl.cpp?ds=inline diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index e83cf09c9a..c6beb418d7 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -69,6 +69,28 @@ #define CFM_BACKCOLOR 0x04000000 #endif +// cygwin does not have these defined for richedit +#ifndef ENM_LINK + #define ENM_LINK 0x04000000 +#endif + +#ifndef EM_AUTOURLDETECT + #define EM_AUTOURLDETECT (WM_USER + 91) +#endif + +#ifndef EN_LINK + #define EN_LINK 0x070b + + typedef struct _enlink + { + NMHDR nmhdr; + UINT msg; + WPARAM wParam; + LPARAM lParam; + CHARRANGE chrg; + } ENLINK; +#endif // ENLINK + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -676,7 +698,6 @@ bool wxTextCtrl::IsEditable() const void wxTextCtrl::Replace(long from, long to, const wxString& value) { -#if wxUSE_CLIPBOARD HWND hWnd = GetHwnd(); long fromChar = from; long toChar = to; @@ -684,21 +705,10 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value) // Set selection and remove it #ifdef __WIN32__ SendMessage(hWnd, EM_SETSEL, fromChar, toChar); + SendMessage(hWnd, EM_REPLACESEL, (WPARAM)TRUE, (LPARAM)value.c_str()); #else SendMessage(hWnd, EM_SETSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar)); -#endif - SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0); - - // Now replace with 'value', by pasting. - if (wxOpenClipboard()) { - wxSetClipboardData(wxDF_TEXT, (wxObject *) (const wxChar *)value, 0, 0); - wxCloseClipboard(); - - // Paste into edit control - SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L); - } -#else - wxFAIL_MSG("wxTextCtrl::Replace not implemented if wxUSE_CLIPBOARD is 0."); + SendMessage(hWnd, EM_REPLACESEL, (WPARAM)0, (LPARAM)value.c_str()); #endif } @@ -711,10 +721,11 @@ void wxTextCtrl::Remove(long from, long to) // Cut all selected text #ifdef __WIN32__ SendMessage(hWnd, EM_SETSEL, fromChar, toChar); + SendMessage(hWnd, EM_REPLACESEL, (WPARAM)TRUE, (LPARAM)""); #else SendMessage(hWnd, EM_SETSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar)); + SendMessage(hWnd, EM_REPLACESEL, (WPARAM)0, (LPARAM)""); #endif - SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0); } void wxTextCtrl::SetSelection(long from, long to) @@ -917,6 +928,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() )