X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e408bf5257ead0754de5ef37a39867c7536dbe03..404b319a85dadd7decf7a5a5331020520031a41c:/src/msw/textctrl.cpp diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 6a4c1baffe..930b37cd6d 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -30,6 +30,7 @@ #include "wx/textctrl.h" #include "wx/settings.h" #include "wx/brush.h" + #include "wx/dcclient.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/log.h" @@ -63,10 +64,6 @@ #if wxUSE_RICHEDIT -#if wxUSE_INKEDIT -#include "wx/dynlib.h" -#endif - // old mingw32 has richedit stuff directly in windows.h and doesn't have // richedit.h at all #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) @@ -77,6 +74,11 @@ #include "wx/msw/missing.h" +// FIXME-VC6: This seems to be only missing from VC6 headers. +#ifndef SPI_GETCARETWIDTH + #define SPI_GETCARETWIDTH 0x2006 +#endif + #if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT // dummy value used for m_dropTarget, different from any valid pointer value @@ -147,7 +149,7 @@ public: : m_count(count) { wxASSERT_MSG( m_count == -1 || m_count == -2, - _T("wrong initial m_updatesCount value") ); + wxT("wrong initial m_updatesCount value") ); if (m_count != -2) m_count = 0; @@ -169,83 +171,13 @@ public: private: int& m_count; - DECLARE_NO_COPY_CLASS(UpdatesCountFilter) + wxDECLARE_NO_COPY_CLASS(UpdatesCountFilter); }; // ---------------------------------------------------------------------------- // 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) @@ -424,22 +356,26 @@ bool wxTextCtrl::MSWCreateText(const wxString& value, } #endif +#if wxUSE_INKEDIT if (!IsInkEdit()) +#endif // wxUSE_INKEDIT { if ( m_verRichEdit == 2 ) { if ( wxRichEditModule::Load(wxRichEditModule::Version_41) ) { // yes, class name for version 4.1 really is 5.0 - windowClass = _T("RICHEDIT50W"); + windowClass = wxT("RICHEDIT50W"); + + m_verRichEdit = 4; } else if ( wxRichEditModule::Load(wxRichEditModule::Version_2or3) ) { - windowClass = _T("RichEdit20") + windowClass = wxT("RichEdit20") #if wxUSE_UNICODE - _T("W"); + wxT("W"); #else // ANSI - _T("A"); + wxT("A"); #endif // Unicode/ANSI } else // failed to load msftedit.dll and riched20.dll @@ -452,7 +388,7 @@ bool wxTextCtrl::MSWCreateText(const wxString& value, { if ( wxRichEditModule::Load(wxRichEditModule::Version_1) ) { - windowClass = _T("RICHEDIT"); + windowClass = wxT("RICHEDIT"); } else // failed to load any richedit control DLL { @@ -492,7 +428,7 @@ bool wxTextCtrl::MSWCreateText(const wxString& value, // implementation detail m_updatesCount = -2; - if ( !MSWCreateControl(windowClass.wx_str(), msStyle, pos, size, valueWin) ) + if ( !MSWCreateControl(windowClass.t_str(), msStyle, pos, size, valueWin) ) return false; m_updatesCount = -1; @@ -542,7 +478,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, @@ -550,7 +499,37 @@ bool wxTextCtrl::MSWCreateText(const wxString& value, SetWindowPos(GetHwnd(), NULL, 0, 0, 0, 0, SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE| SWP_FRAMECHANGED); -#endif + + if ( IsSingleLine() ) + { + // If we don't set the margins explicitly, their size depends on the + // control initial size, see #2438. So explicitly set them to something + // consistent. And for this we have 2 candidates: EC_USEFONTINFO (which + // sets the left margin to 3 pixels, at least under Windows 7) or 0. We + // use the former because it looks like it was meant to be used as the + // default (what else would it be there for?) and 0 looks bad in + // classic mode, i.e. without themes. Also, the margin can be reset to + // 0 easily by calling SetMargins() explicitly but setting it to the + // default value is not currently supported. + // + // Finally, notice that EC_USEFONTINFO is used differently for plain + // and rich text controls. + WPARAM wParam; + LPARAM lParam; + if ( IsRich() ) + { + wParam = EC_USEFONTINFO; + lParam = 0; + } + else // plain EDIT, EC_USEFONTINFO is used in lParam with them. + { + wParam = EC_LEFTMARGIN | EC_RIGHTMARGIN; + lParam = MAKELPARAM(EC_USEFONTINFO, EC_USEFONTINFO); + } + + ::SendMessage(GetHwnd(), EM_SETMARGINS, wParam, lParam); + } +#endif // !__WXWINCE__ return true; } @@ -567,16 +546,16 @@ void wxTextCtrl::AdoptAttributesFromHWND() #if wxUSE_RICHEDIT wxString classname = wxGetWindowClass(GetHWND()); - if ( classname.IsSameAs(_T("EDIT"), false /* no case */) ) + if ( classname.IsSameAs(wxT("EDIT"), false /* no case */) ) { m_verRichEdit = 0; } else // rich edit? { wxChar c; - if ( wxSscanf(classname, _T("RichEdit%d0%c"), &m_verRichEdit, &c) != 2 ) + if ( wxSscanf(classname, wxT("RichEdit%d0%c"), &m_verRichEdit, &c) != 2 ) { - wxLogDebug(_T("Unknown edit control '%s'."), classname.c_str()); + wxLogDebug(wxT("Unknown edit control '%s'."), classname.c_str()); m_verRichEdit = 0; } @@ -787,10 +766,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(); } @@ -841,8 +820,8 @@ wxString wxTextCtrl::GetRange(long from, long to) const // style - convert it to something reasonable for ( ; *p; p++ ) { - if ( *p == _T('\r') ) - *p = _T('\n'); + if ( *p == wxT('\r') ) + *p = wxT('\n'); } } } @@ -858,8 +837,9 @@ wxString wxTextCtrl::GetRange(long from, long to) const else #endif // wxUSE_RICHEDIT { - // retrieve all text - str = wxGetWindowText(GetHWND()); + // retrieve all text: wxTextEntry method works even for multiline + // controls and must be used for single line ones to account for hints + str = wxTextEntry::GetValue(); // need only a range? if ( from < to ) @@ -882,7 +862,7 @@ void wxTextCtrl::DoSetValue(const wxString& value, int flags) // comparing it with the old one (chances are that it will be different // anyhow, this comparison is there to avoid flicker for small single-line // edit controls mostly) - if ( (value.length() > 0x400) || (value != GetValue()) ) + if ( (value.length() > 0x400) || (value != DoGetValue()) ) { DoWriteText(value, flags /* doesn't include SelectionOnly here */); @@ -912,7 +892,7 @@ void wxTextCtrl::DoSetValue(const wxString& value, int flags) // TODO: using memcpy() would improve performance a lot for big amounts of text DWORD CALLBACK -wxRichEditStreamIn(DWORD dwCookie, BYTE *buf, LONG cb, LONG *pcb) +wxRichEditStreamIn(DWORD_PTR dwCookie, BYTE *buf, LONG cb, LONG *pcb) { *pcb = 0; @@ -999,7 +979,7 @@ wxTextCtrl::StreamIn(const wxString& value, // finally, stream it in the control EDITSTREAM eds; wxZeroMemory(eds); - eds.dwCookie = (DWORD)&wpc; + eds.dwCookie = (DWORD_PTR)&wpc; // the cast below is needed for broken (very) old mingw32 headers eds.pfnCallback = (EDITSTREAMCALLBACK)wxRichEditStreamIn; @@ -1015,17 +995,13 @@ wxTextCtrl::StreamIn(const wxString& value, // It's okay for EN_UPDATE to not be sent if the selection is empty and // the text is empty, otherwise warn the programmer about it. wxASSERT_MSG( ucf.GotUpdate() || ( !HasSelection() && value.empty() ), - _T("EM_STREAMIN didn't send EN_UPDATE?") ); + wxT("EM_STREAMIN didn't send EN_UPDATE?") ); if ( eds.dwError ) { - wxLogLastError(_T("EM_STREAMIN")); + wxLogLastError(wxT("EM_STREAMIN")); } -#if !wxUSE_WCHAR_T - free(wchBuf); -#endif // !wxUSE_WCHAR_T - return true; } @@ -1038,13 +1014,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; @@ -1052,7 +1023,7 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const EDITSTREAM eds; wxZeroMemory(eds); - eds.dwCookie = (DWORD)&data; + eds.dwCookie = (DWORD_PTR)&data; eds.pfnCallback = wxRichEditStreamOut; ::SendMessage @@ -1065,7 +1036,7 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const if ( eds.dwError ) { - wxLogLastError(_T("EM_STREAMOUT")); + wxLogLastError(wxT("EM_STREAMOUT")); } else // streamed out ok { @@ -1084,10 +1055,6 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const } } -#if !wxUSE_WCHAR_T - free(wchBuf); -#endif // !wxUSE_WCHAR_T - return out; } @@ -1137,10 +1104,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 ) @@ -1173,7 +1140,7 @@ void wxTextCtrl::DoWriteText(const wxString& value, int flags) ::SendMessage(GetHwnd(), selectionOnly ? EM_REPLACESEL : WM_SETTEXT, // EM_REPLACESEL takes 1 to indicate the operation should be redoable - selectionOnly ? 1 : 0, (LPARAM)valueDos.wx_str()); + selectionOnly ? 1 : 0, wxMSW_CONV_LPARAM(valueDos)); if ( !ucf.GotUpdate() && (flags & SetValue_SendEvent) ) { @@ -1190,9 +1157,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 } @@ -1556,6 +1521,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; +} + + // ---------------------------------------------------------------------------- // // ---------------------------------------------------------------------------- @@ -1618,24 +1670,24 @@ wxString wxTextCtrl::GetLineText(long lineNo) const { // remove the '\r' returned by the rich edit control, the user code // should never see it - if ( buf[len - 2] == _T('\r') && buf[len - 1] == _T('\n') ) + if ( buf[len - 2] == wxT('\r') && buf[len - 1] == wxT('\n') ) { // richedit 1.0 uses "\r\n" as line terminator, so remove "\r" // here and "\n" below - buf[len - 2] = _T('\n'); + buf[len - 2] = wxT('\n'); len--; } - else if ( buf[len - 1] == _T('\r') ) + else if ( buf[len - 1] == wxT('\r') ) { // richedit 2.0+ uses only "\r", replace it with "\n" - buf[len - 1] = _T('\n'); + buf[len - 1] = wxT('\n'); } } #endif // wxUSE_RICHEDIT // remove the '\n' at the end, if any (this is how this function is // supposed to work according to the docs) - if ( buf[len - 1] == _T('\n') ) + if ( buf[len - 1] == wxT('\n') ) { len--; } @@ -1756,12 +1808,23 @@ bool wxTextCtrl::MSWShouldPreProcessMessage(WXMSG* msg) switch ( ctrl + shift ) { default: - wxFAIL_MSG( _T("how many modifiers have we got?") ); + wxFAIL_MSG( wxT("how many modifiers have we got?") ); // fall through case 0: - if ( IsMultiLine() && vkey == VK_RETURN ) - return false; + switch ( vkey ) + { + case VK_RETURN: + // This one is only special for multi line controls. + if ( !IsMultiLine() ) + break; + // fall through + + case VK_DELETE: + case VK_HOME: + case VK_END: + return false; + } // fall through case 2: break; @@ -1877,6 +1940,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(); } @@ -1923,8 +1994,26 @@ WXLRESULT wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara // live with it. lRc = lDlgCode; } + if (IsMultiLine()) + // Clear the DLGC_HASSETSEL bit from the return value + lRc &= ~DLGC_HASSETSEL; } break; + +#if wxUSE_MENUS + case WM_SETCURSOR: + // rich text controls seem to have a bug and don't change the + // cursor to the standard arrow one from the I-beam cursor usually + // used by them even when a popup menu is shown (this works fine + // for plain EDIT controls though), so explicitly work around this + if ( IsRich() ) + { + extern wxMenu *wxCurrentPopupMenu; + if ( wxCurrentPopupMenu && + wxCurrentPopupMenu->GetInvokingWindow() == this ) + ::SetCursor(GetHcursorOf(*wxSTANDARD_CURSOR)); + } +#endif // wxUSE_MENUS } return lRc; @@ -1948,7 +2037,7 @@ bool wxTextCtrl::SendUpdateEvent() return false; default: - wxFAIL_MSG( _T("unexpected wxTextCtrl::m_updatesCount value") ); + wxFAIL_MSG( wxT("unexpected wxTextCtrl::m_updatesCount value") ); // fall through case -1: @@ -1997,7 +2086,7 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) WXHBRUSH wxTextCtrl::MSWControlColor(WXHDC hDC, WXHWND hWnd) { - if ( !IsEnabled() && !HasFlag(wxTE_MULTILINE) ) + if ( !IsThisEnabled() && !HasFlag(wxTE_MULTILINE) ) return MSWControlColorDisabled(hDC); return wxTextCtrlBase::MSWControlColor(hDC, hWnd); @@ -2048,22 +2137,61 @@ bool wxTextCtrl::AcceptsFocusFromKeyboard() const } wxSize wxTextCtrl::DoGetBestSize() const +{ + return DoGetSizeFromTextSize( DEFAULT_ITEM_WIDTH ); +} + +wxSize wxTextCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const { int cx, cy; wxGetCharSize(GetHWND(), &cx, &cy, GetFont()); - int wText = DEFAULT_ITEM_WIDTH; + DWORD wText = 1; + ::SystemParametersInfo(SPI_GETCARETWIDTH, 0, &wText, 0); + wText += xlen; int hText = cy; if ( m_windowStyle & wxTE_MULTILINE ) { - hText *= wxMax(wxMin(GetNumberOfLines(), 10), 2); + // add space for vertical scrollbar + if ( !(m_windowStyle & wxTE_NO_VSCROLL) ) + wText += ::GetSystemMetrics(SM_CXVSCROLL); + + if ( ylen <= 0 ) + { + hText *= wxMax(wxMin(GetNumberOfLines(), 10), 2); + // add space for horizontal scrollbar + if ( m_windowStyle & wxHSCROLL ) + hText += ::GetSystemMetrics(SM_CYHSCROLL); + } + } + // for single line control cy (height + external leading) is ok + else + { + // Add the margins we have previously set + wxPoint marg( GetMargins() ); + wText += wxMax(0, marg.x); + hText += wxMax(0, marg.y); } - //else: for single line control everything is ok - // we have to add the adjustments for the control height only once, not - // once per line, so do it after multiplication above - hText += EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) - cy; + // Text controls without border are special and have the same height as + // static labels (they also have the same appearance when they're disable + // and are often used as a sort of copyable to the clipboard label so it's + // important that they have the same height as the normal labels to not + // stand out). + if ( !HasFlag(wxBORDER_NONE) ) + { + wText += 9; // borders and inner margins + + // we have to add the adjustments for the control height only once, not + // once per line, so do it after multiplication above + hText += EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) - cy; + } + + // Perhaps the user wants something different from CharHeight, or ylen + // is used as the height of a multiline text. + if ( ylen > 0 ) + hText += ylen - GetCharHeight(); return wxSize(wText, hText); } @@ -2179,23 +2307,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 @@ -2348,9 +2459,7 @@ bool wxTextCtrl::SetForegroundColour(const wxColour& colour) if ( IsRich() ) { // change the colour of everything - CHARFORMAT cf; - wxZeroMemory(cf); - cf.cbSize = sizeof(cf); + WinStruct cf; cf.dwMask = CFM_COLOR; cf.crTextColor = wxColourToRGB(colour); ::SendMessage(GetHwnd(), EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf); @@ -2359,50 +2468,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; @@ -2484,17 +2574,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 ) { - wxLogDebug(_T("SendMessage(EM_SETCHARFORMAT, SCF_SELECTION) failed")); + DoSetSelection(start, end, SetSel_NoScroll); + selMode = SCF_SELECTION; + } + else + { + selMode = SCF_ALL; + } + + if ( !::SendMessage(GetHwnd(), EM_SETCHARFORMAT, selMode, (LPARAM)&cf) ) + { + 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 @@ -2569,16 +2679,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(_T("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); @@ -2653,7 +2801,10 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style) LOGFONT lf; - lf.lfHeight = cf.yHeight; + // Convert the height from the units of 1/20th of the point in which + // CHARFORMAT stores it to pixel-based units used by LOGFONT. + const wxCoord ppi = wxClientDC(this).GetPPI().y; + lf.lfHeight = -MulDiv(cf.yHeight/20, ppi, 72); lf.lfWidth = 0; lf.lfCharSet = ANSI_CHARSET; // FIXME: how to get correct charset? lf.lfClipPrecision = 0; @@ -2687,7 +2838,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); } @@ -2793,11 +2944,11 @@ bool wxRichEditModule::Load(Version version) return true; } - static const wxChar *dllnames[] = + static const wxChar *const dllnames[] = { - _T("riched32"), - _T("riched20"), - _T("msftedit"), + wxT("riched32"), + wxT("riched20"), + wxT("msftedit"), }; wxCOMPILE_TIME_ASSERT( WXSIZEOF(dllnames) == Version_Max, @@ -2819,10 +2970,8 @@ bool wxRichEditModule::Load(Version version) // load the InkEdit library bool wxRichEditModule::LoadInkEdit() { - static wxDynamicLibrary ms_inkEditLib; - static bool ms_inkEditLibLoadAttemped; if (ms_inkEditLibLoadAttemped) - ms_inkEditLib.IsLoaded(); + return ms_inkEditLib.IsLoaded(); ms_inkEditLibLoadAttemped = true;