X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b6126aa3adb67be63054dedc86d5ed90c65de22..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/msw/textctrl.cpp?ds=sidebyside diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 90e8c472d6..850ea6ee93 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -176,76 +176,6 @@ private: // event tables and other macros // ---------------------------------------------------------------------------- -#if wxUSE_EXTENDED_RTTI -WX_DEFINE_FLAGS( wxTextCtrlStyle ) - -wxBEGIN_FLAGS( wxTextCtrlStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxTE_PROCESS_ENTER) - wxFLAGS_MEMBER(wxTE_PROCESS_TAB) - wxFLAGS_MEMBER(wxTE_MULTILINE) - wxFLAGS_MEMBER(wxTE_PASSWORD) - wxFLAGS_MEMBER(wxTE_READONLY) - wxFLAGS_MEMBER(wxHSCROLL) - wxFLAGS_MEMBER(wxTE_RICH) - wxFLAGS_MEMBER(wxTE_RICH2) - wxFLAGS_MEMBER(wxTE_AUTO_URL) - wxFLAGS_MEMBER(wxTE_NOHIDESEL) - wxFLAGS_MEMBER(wxTE_LEFT) - wxFLAGS_MEMBER(wxTE_CENTRE) - wxFLAGS_MEMBER(wxTE_RIGHT) - wxFLAGS_MEMBER(wxTE_DONTWRAP) - wxFLAGS_MEMBER(wxTE_CHARWRAP) - wxFLAGS_MEMBER(wxTE_WORDWRAP) - -wxEND_FLAGS( wxTextCtrlStyle ) - -IMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl,"wx/textctrl.h") - -wxBEGIN_PROPERTIES_TABLE(wxTextCtrl) - wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent ) - wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent ) - - wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) - wxPROPERTY( Value , wxString , SetValue, GetValue, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY_FLAGS( WindowStyle , wxTextCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxBEGIN_HANDLERS_TABLE(wxTextCtrl) -wxEND_HANDLERS_TABLE() - -wxCONSTRUCTOR_6( wxTextCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size , long , WindowStyle) -#else -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase) -#endif - - BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) EVT_CHAR(wxTextCtrl::OnChar) EVT_KEY_DOWN(wxTextCtrl::OnKeyDown) @@ -434,6 +364,8 @@ bool wxTextCtrl::MSWCreateText(const wxString& value, { // yes, class name for version 4.1 really is 5.0 windowClass = wxT("RICHEDIT50W"); + + m_verRichEdit = 4; } else if ( wxRichEditModule::Load(wxRichEditModule::Version_2or3) ) { @@ -544,7 +476,20 @@ bool wxTextCtrl::MSWCreateText(const wxString& value, ::SendMessage(GetHwnd(), EM_SETEVENTMASK, 0, mask); } + else #endif // wxUSE_RICHEDIT + if ( HasFlag(wxTE_MULTILINE) && HasFlag(wxTE_READONLY) ) + { + // non-rich read-only multiline controls have grey background by + // default under MSW but this is not always appropriate, so forcefully + // reset the background colour to normal default + // + // this is not ideal but, after a long discussion on wx-dev (see + // http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/116360/) it + // was finally deemed to be the best behaviour by default (and ideally + // we'd have a way to change this, see #11521) + SetBackgroundColour(GetClassDefaultAttributes().colBg); + } #ifndef __WXWINCE__ // Without this, if we pass the size in the constructor and then don't change it, @@ -789,10 +734,10 @@ wxString wxTextCtrl::GetRange(long from, long to) const wxFontEncoding encoding = wxFONTENCODING_SYSTEM; wxFont font = m_defaultStyle.GetFont(); - if ( !font.Ok() ) + if ( !font.IsOk() ) font = GetFont(); - if ( font.Ok() ) + if ( font.IsOk() ) { encoding = font.GetEncoding(); } @@ -1025,10 +970,6 @@ wxTextCtrl::StreamIn(const wxString& value, wxLogLastError(wxT("EM_STREAMIN")); } -#if !wxUSE_WCHAR_T - free(wchBuf); -#endif // !wxUSE_WCHAR_T - return true; } @@ -1041,13 +982,8 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const const int len = GetWindowTextLength(GetHwnd()); -#if wxUSE_WCHAR_T wxWCharBuffer wchBuf(len); wchar_t *wpc = wchBuf.data(); -#else - wchar_t *wchBuf = (wchar_t *)malloc((len + 1)*sizeof(wchar_t)); - wchar_t *wpc = wchBuf; -#endif wxStreamOutData data; data.wpc = wpc; @@ -1087,10 +1023,6 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const } } -#if !wxUSE_WCHAR_T - free(wchBuf); -#endif // !wxUSE_WCHAR_T - return out; } @@ -1140,10 +1072,10 @@ void wxTextCtrl::DoWriteText(const wxString& value, int flags) if ( GetRichVersion() > 1 ) { wxFont font = m_defaultStyle.GetFont(); - if ( !font.Ok() ) + if ( !font.IsOk() ) font = GetFont(); - if ( font.Ok() ) + if ( font.IsOk() ) { wxFontEncoding encoding = font.GetEncoding(); if ( encoding != wxFONTENCODING_SYSTEM ) @@ -1193,9 +1125,7 @@ void wxTextCtrl::AppendText(const wxString& text) // don't do this if we're frozen, saves some time if ( !IsFrozen() && IsMultiLine() && GetRichVersion() > 1 ) { - // setting the caret to the end and showing it simply doesn't work for - // RichEdit 2.0 -- force it to still do what we want - ::SendMessage(GetHwnd(), EM_LINESCROLL, 0, GetNumberOfLines()); + ::SendMessage(GetHwnd(), WM_VSCROLL, SB_BOTTOM, (LPARAM)NULL); } #endif // wxUSE_RICHEDIT } @@ -1559,6 +1489,93 @@ wxTextCtrl::HitTest(const wxPoint& pt, long *posOut) const return rc; } +wxPoint wxTextCtrl::DoPositionToCoords(long pos) const +{ + // FIXME: This code is broken for rich edit version 2.0 as it uses the same + // API as plain edit i.e. the coordinates are returned directly instead of + // filling the POINT passed as WPARAM with them but we can't distinguish + // between 2.0 and 3.0 unfortunately (see also the use of EM_POSFROMCHAR + // above). +#if wxUSE_RICHEDIT + if ( IsRich() ) + { + POINT pt; + LRESULT rc = ::SendMessage(GetHwnd(), EM_POSFROMCHAR, (WPARAM)&pt, pos); + if ( rc != -1 ) + return wxPoint(pt.x, pt.y); + } + else +#endif // wxUSE_RICHEDIT + { + LRESULT rc = ::SendMessage(GetHwnd(), EM_POSFROMCHAR, pos, 0); + if ( rc == -1 ) + { + // Finding coordinates for the last position of the control fails + // in plain EDIT control, try to compensate for it by finding it + // ourselves from the position of the previous character. + if ( pos < GetLastPosition() ) + { + // It's not the expected correctable failure case so just fail. + return wxDefaultPosition; + } + + if ( pos == 0 ) + { + // We're being asked the coordinates of the first (and last and + // only) position in an empty control. There is no way to get + // it directly with EM_POSFROMCHAR but EM_GETMARGINS returns + // the correct value for at least the horizontal offset. + rc = ::SendMessage(GetHwnd(), EM_GETMARGINS, 0, 0); + + // Text control seems to effectively add 1 to margin. + return wxPoint(LOWORD(rc) + 1, 1); + } + + // We do have a previous character, try to get its coordinates. + rc = ::SendMessage(GetHwnd(), EM_POSFROMCHAR, pos - 1, 0); + if ( rc == -1 ) + { + // If getting coordinates of the previous character failed as + // well, just give up. + return wxDefaultPosition; + } + + wxString prevChar = GetRange(pos - 1, pos); + wxSize prevCharSize = GetTextExtent(prevChar); + + if ( prevChar == wxT("\n" )) + { + // 'pos' is at the beginning of a new line so its X coordinate + // should be the same as X coordinate of the first character of + // any other line while its Y coordinate will be approximately + // (but we can't compute it exactly...) one character height + // more than that of the previous character. + LRESULT coords0 = ::SendMessage(GetHwnd(), EM_POSFROMCHAR, 0, 0); + if ( coords0 == -1 ) + return wxDefaultPosition; + + rc = MAKELPARAM(LOWORD(coords0), HIWORD(rc) + prevCharSize.y); + } + else + { + // Simple case: previous character is in the same line so this + // one is just after it. + rc += MAKELPARAM(prevCharSize.x, 0); + } + } + + // Notice that {LO,HI}WORD macros return WORDs, i.e. unsigned shorts, + // while we want to have signed values here (the y coordinate of any + // position above the first currently visible line is negative, for + // example), hence the need for casts. + return wxPoint(static_cast(LOWORD(rc)), + static_cast(HIWORD(rc))); + } + + return wxDefaultPosition; +} + + // ---------------------------------------------------------------------------- // // ---------------------------------------------------------------------------- @@ -1880,6 +1897,14 @@ void wxTextCtrl::OnKeyDown(wxKeyEvent& event) } } + // Default window procedure of multiline edit controls posts WM_CLOSE to + // the parent window when it gets Escape key press for some reason, prevent + // it from doing this as this resulted in dialog boxes being closed on + // Escape even when they shouldn't be (we do handle Escape ourselves + // correctly in the situations when it should close them). + if ( event.GetKeyCode() == WXK_ESCAPE && IsMultiLine() ) + return; + // no, we didn't process it event.Skip(); } @@ -2197,23 +2222,6 @@ void wxTextCtrl::OnSetFocus(wxFocusEvent& event) event.Skip(); } -// ---------------------------------------------------------------------------- -// Default colors for MSW text control -// -// Set default background color to the native white instead of -// the default wxSYS_COLOUR_BTNFACE (is triggered with wxNullColour). -// ---------------------------------------------------------------------------- - -wxVisualAttributes wxTextCtrl::GetDefaultAttributes() const -{ - wxVisualAttributes attrs; - attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); - attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); //white - - return attrs; -} - // the rest of the file only deals with the rich edit controls #if wxUSE_RICHEDIT @@ -2377,50 +2385,31 @@ bool wxTextCtrl::SetForegroundColour(const wxColour& colour) return true; } -// ---------------------------------------------------------------------------- -// styling support for rich edit controls -// ---------------------------------------------------------------------------- - -bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) +bool wxTextCtrl::SetFont(const wxFont& font) { - if ( !IsRich() ) - { - // can't do it with normal text control + if ( !wxTextCtrlBase::SetFont(font) ) return false; - } - // the richedit 1.0 doesn't handle setting background colour, so don't - // even try to do anything if it's the only thing we want to change - if ( m_verRichEdit == 1 && !style.HasFont() && !style.HasTextColour() && - !style.HasLeftIndent() && !style.HasRightIndent() && !style.HasAlignment() && - !style.HasTabs() ) + if ( GetRichVersion() >= 4 ) { - // nothing to do: return true if there was really nothing to do and - // false if we failed to set bg colour - return !style.HasBackgroundColour(); + // Using WM_SETFONT is not enough with RichEdit 4.1: it does work but + // for ASCII characters only and inserting a non-ASCII one into it + // later reverts to the default font so use EM_SETCHARFORMAT to change + // the default font for it. + wxTextAttr attr; + attr.SetFont(font); + SetStyle(-1, -1, attr); } - // order the range if needed - if ( start > end ) - { - long tmp = start; - start = end; - end = tmp; - } - - // we can only change the format of the selection, so select the range we - // want and restore the old selection later - long startOld, endOld; - GetSelection(&startOld, &endOld); - - // but do we really have to change the selection? - bool changeSel = start != startOld || end != endOld; + return true; +} - if ( changeSel ) - { - DoSetSelection(start, end, SetSel_NoScroll); - } +// ---------------------------------------------------------------------------- +// styling support for rich edit controls +// ---------------------------------------------------------------------------- +bool wxTextCtrl::MSWSetCharFormat(const wxTextAttr& style, long start, long end) +{ // initialize CHARFORMAT struct #if wxUSE_RICHEDIT2 CHARFORMAT2 cf; @@ -2502,17 +2491,37 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) } #endif // wxUSE_RICHEDIT2 - // do format the selection - bool ok = ::SendMessage(GetHwnd(), EM_SETCHARFORMAT, - SCF_SELECTION, (LPARAM)&cf) != 0; - if ( !ok ) + // Apply the style either to the selection or to the entire control. + WPARAM selMode; + if ( start != -1 || end != -1 ) + { + DoSetSelection(start, end, SetSel_NoScroll); + selMode = SCF_SELECTION; + } + else + { + selMode = SCF_ALL; + } + + if ( !::SendMessage(GetHwnd(), EM_SETCHARFORMAT, selMode, (LPARAM)&cf) ) { - wxLogDebug(wxT("SendMessage(EM_SETCHARFORMAT, SCF_SELECTION) failed")); + wxLogLastError(wxT("SendMessage(EM_SETCHARFORMAT)")); + return false; } - // now do the paragraph formatting + return true; +} + +bool wxTextCtrl::MSWSetParaFormat(const wxTextAttr& style, long start, long end) +{ +#if wxUSE_RICHEDIT2 PARAFORMAT2 pf; +#else + PARAFORMAT pf; +#endif + wxZeroMemory(pf); + // we can't use PARAFORMAT2 with RichEdit 1.0, so pretend it is a simple // PARAFORMAT in that case #if wxUSE_RICHEDIT2 @@ -2587,16 +2596,54 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) if ( pf.dwMask ) { - // do format the selection - bool ok = ::SendMessage(GetHwnd(), EM_SETPARAFORMAT, - 0, (LPARAM) &pf) != 0; - if ( !ok ) + // Do format the selection. + DoSetSelection(start, end, SetSel_NoScroll); + + if ( !::SendMessage(GetHwnd(), EM_SETPARAFORMAT, 0, (LPARAM) &pf) ) { - wxLogDebug(wxT("SendMessage(EM_SETPARAFORMAT, 0) failed")); + wxLogLastError(wxT("SendMessage(EM_SETPARAFORMAT)")); + + return false; } } - if ( changeSel ) + return true; +} + +bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) +{ + if ( !IsRich() ) + { + // can't do it with normal text control + return false; + } + + // the richedit 1.0 doesn't handle setting background colour, so don't + // even try to do anything if it's the only thing we want to change + if ( m_verRichEdit == 1 && !style.HasFont() && !style.HasTextColour() && + !style.HasLeftIndent() && !style.HasRightIndent() && !style.HasAlignment() && + !style.HasTabs() ) + { + // nothing to do: return true if there was really nothing to do and + // false if we failed to set bg colour + return !style.HasBackgroundColour(); + } + + // order the range if needed + if ( start > end ) + wxSwap(start, end); + + // we can only change the format of the selection, so select the range we + // want and restore the old selection later, after MSWSetXXXFormat() + // functions (possibly) change it. + long startOld, endOld; + GetSelection(&startOld, &endOld); + + bool ok = MSWSetCharFormat(style, start, end); + if ( !MSWSetParaFormat(style, start, end) ) + ok = false; + + if ( start != startOld || end != endOld ) { // restore the original selection DoSetSelection(startOld, endOld, SetSel_NoScroll); @@ -2705,7 +2752,7 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style) lf.lfWeight = FW_NORMAL; wxFont font = wxCreateFontFromLogFont(& lf); - if (font.Ok()) + if (font.IsOk()) { style.SetFont(font); } @@ -2811,7 +2858,7 @@ bool wxRichEditModule::Load(Version version) return true; } - static const wxChar *dllnames[] = + static const wxChar *const dllnames[] = { wxT("riched32"), wxT("riched20"),