X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/093dee5e9d6574cf2c4e4c6764b7a40573ae4a4d..e822d1bd5fc4f3ac91fafd201d7519d091408dd2:/src/msw/textctrl.cpp diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 25aecb4bdf..83d1ffbd06 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/textctrl.cpp +// Name: src/msw/textctrl.cpp // Purpose: wxTextCtrl // Author: Julian Smart // Modified by: @@ -13,10 +13,6 @@ // declarations // ============================================================================ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "textctrl.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -39,9 +35,12 @@ #include "wx/log.h" #include "wx/app.h" #include "wx/menu.h" + #include "wx/math.h" + #include "wx/module.h" + #include "wx/wxcrtvararg.h" #endif -#include "wx/module.h" +#include "wx/sysopt.h" #if wxUSE_CLIPBOARD #include "wx/clipbrd.h" @@ -53,6 +52,7 @@ #include "wx/msw/private.h" #include "wx/msw/winundef.h" +#include "wx/msw/mslu.h" #include #include @@ -63,15 +63,28 @@ #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__) #include #endif +#endif // wxUSE_RICHEDIT + #include "wx/msw/missing.h" -#endif // wxUSE_RICHEDIT +#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT + +// dummy value used for m_dropTarget, different from any valid pointer value +// (which are all even under Windows) and NULL +static wxDropTarget * + wxRICHTEXT_DEFAULT_DROPTARGET = wx_reinterpret_cast(wxDropTarget *, 1); + +#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT // ---------------------------------------------------------------------------- // private classes @@ -83,25 +96,82 @@ class wxRichEditModule : public wxModule { public: + enum Version + { + Version_1, // riched32.dll + Version_2or3, // both use riched20.dll + Version_41, // msftedit.dll (XP SP1 and Windows 2003) + Version_Max + }; + virtual bool OnInit(); virtual void OnExit(); - // load the richedit DLL of at least of required version - static bool Load(int version = 1); + // load the richedit DLL for the specified version of rich edit + static bool Load(Version version); + +#if wxUSE_INKEDIT + // load the InkEdit library + static bool LoadInkEdit(); +#endif private: // the handles to richedit 1.0 and 2.0 (or 3.0) DLLs - static HINSTANCE ms_hRichEdit[2]; + static HINSTANCE ms_hRichEdit[Version_Max]; + +#if wxUSE_INKEDIT + static wxDynamicLibrary ms_inkEditLib; + static bool ms_inkEditLibLoadAttemped; +#endif DECLARE_DYNAMIC_CLASS(wxRichEditModule) }; -HINSTANCE wxRichEditModule::ms_hRichEdit[2] = { NULL, NULL }; +HINSTANCE wxRichEditModule::ms_hRichEdit[Version_Max] = { NULL, NULL, NULL }; + +#if wxUSE_INKEDIT +wxDynamicLibrary wxRichEditModule::ms_inkEditLib; +bool wxRichEditModule::ms_inkEditLibLoadAttemped = false; +#endif IMPLEMENT_DYNAMIC_CLASS(wxRichEditModule, wxModule) #endif // wxUSE_RICHEDIT +// a small class used to set m_updatesCount to 0 (to filter duplicate events if +// necessary) and to reset it back to -1 afterwards +class UpdatesCountFilter +{ +public: + UpdatesCountFilter(int& count) + : m_count(count) + { + wxASSERT_MSG( m_count == -1 || m_count == -2, + _T("wrong initial m_updatesCount value") ); + + if (m_count != -2) + m_count = 0; + //else: we don't want to count how many update events we get as we're going + // to ignore all of them + } + + ~UpdatesCountFilter() + { + m_count = -1; + } + + // return true if an event has been received + bool GotUpdate() const + { + return m_count == 1; + } + +private: + int& m_count; + + DECLARE_NO_COPY_CLASS(UpdatesCountFilter) +}; + // ---------------------------------------------------------------------------- // event tables and other macros // ---------------------------------------------------------------------------- @@ -151,7 +221,7 @@ wxBEGIN_FLAGS( wxTextCtrlStyle ) wxFLAGS_MEMBER(wxTE_CENTRE) wxFLAGS_MEMBER(wxTE_RIGHT) wxFLAGS_MEMBER(wxTE_DONTWRAP) - wxFLAGS_MEMBER(wxTE_LINEWRAP) + wxFLAGS_MEMBER(wxTE_CHARWRAP) wxFLAGS_MEMBER(wxTE_WORDWRAP) wxEND_FLAGS( wxTextCtrlStyle ) @@ -172,16 +242,17 @@ wxEND_HANDLERS_TABLE() wxCONSTRUCTOR_6( wxTextCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size , long , WindowStyle) #else -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase) #endif -BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) +BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) EVT_CHAR(wxTextCtrl::OnChar) + EVT_KEY_DOWN(wxTextCtrl::OnKeyDown) EVT_DROP_FILES(wxTextCtrl::OnDropFiles) #if wxUSE_RICHEDIT - EVT_RIGHT_UP(wxTextCtrl::OnRightClick) + EVT_CONTEXT_MENU(wxTextCtrl::OnContextMenu) #endif EVT_MENU(wxID_CUT, wxTextCtrl::OnCut) @@ -217,21 +288,30 @@ void wxTextCtrl::Init() m_verRichEdit = 0; #endif // wxUSE_RICHEDIT +#if wxUSE_INKEDIT && wxUSE_RICHEDIT + m_isInkEdit = 0; +#endif + m_privateContextMenu = NULL; - m_suppressNextUpdate = false; + m_updatesCount = -1; m_isNativeCaretShown = true; } wxTextCtrl::~wxTextCtrl() { - if (m_privateContextMenu) +#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT + if ( m_dropTarget == wxRICHTEXT_DEFAULT_DROPTARGET ) { - delete m_privateContextMenu; - m_privateContextMenu = NULL; + // don't try to destroy this dummy pointer in the base class dtor + m_dropTarget = NULL; } +#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT + + delete m_privateContextMenu; } -bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, +bool wxTextCtrl::Create(wxWindow *parent, + wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, @@ -239,21 +319,57 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { -#ifdef __WXWINCE__ - if ((style & wxBORDER_MASK) == 0) - style |= wxBORDER_SIMPLE; -#endif - // base initialization if ( !CreateControl(parent, id, pos, size, style, validator, name) ) return false; + if ( !MSWCreateText(value, pos, size) ) + return false; + +#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT + if ( IsRich() ) + { + // rich text controls have a default associated drop target which + // allows them to receive (rich) text dropped on them, which is nice, + // but prevents us from associating a user-defined drop target with + // them as we need to unregister the old one first + // + // to make it work, we set m_dropTarget to this special value initially + // and check for it in our SetDropTarget() + m_dropTarget = wxRICHTEXT_DEFAULT_DROPTARGET; + } +#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT + + return true; +} + +// returns true if the platform should explicitly apply a theme border +bool wxTextCtrl::CanApplyThemeBorder() const +{ +#ifdef __WXWINCE__ + return false; +#else + // Standard text control already handles theming + return ((GetWindowStyle() & (wxTE_RICH|wxTE_RICH2)) != 0); +#endif +} + +bool wxTextCtrl::MSWCreateText(const wxString& value, + const wxPoint& pos, + const wxSize& size) +{ // translate wxWin style flags to MSW ones WXDWORD msStyle = MSWGetCreateWindowFlags(); // do create the control - either an EDIT or RICHEDIT wxString windowClass = wxT("EDIT"); +#if defined(__POCKETPC__) || defined(__SMARTPHONE__) + // A control that capitalizes the first letter + if ( HasFlag(wxTE_CAPITALIZE) ) + windowClass = wxT("CAPEDIT"); +#endif + #if wxUSE_RICHEDIT if ( m_windowStyle & wxTE_AUTO_URL ) { @@ -270,65 +386,90 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, // we need to load the richedit DLL before creating the rich edit control if ( m_windowStyle & wxTE_RICH ) { - static bool s_errorGiven = false;// MT-FIXME - - // Which version do we need? Use 1.0 by default because it is much more - // like the the standard EDIT or 2.0 if explicitly requested, but use - // only 2.0 in Unicode mode as 1.0 doesn't support Unicode at all + // versions 2.0, 3.0 and 4.1 of rich edit are mostly compatible with + // each other but not with version 1.0, so we have separate flags for + // the version 1.0 and the others (and so m_verRichEdit may be 0 (plain + // EDIT control), 1 for version 1.0 or 2 for any higher version) // - // TODO: RichEdit 3.0 is apparently capable of emulating RichEdit 1.0 - // (and thus EDIT) much better than RichEdit 2.0 so we probably - // should use 3.0 if available as it is the best of both worlds - - // but as I can't test it right now I don't do it (VZ) + // notice that 1.0 has no Unicode support at all so in Unicode build we + // must use another version + #if wxUSE_UNICODE - const int verRichEdit = 2; + m_verRichEdit = 2; #else // !wxUSE_UNICODE - int verRichEdit = m_windowStyle & wxTE_RICH2 ? 2 : 1; + m_verRichEdit = m_windowStyle & wxTE_RICH2 ? 2 : 1; #endif // wxUSE_UNICODE/!wxUSE_UNICODE - // only give the error msg once if the DLL can't be loaded - if ( !s_errorGiven ) +#if wxUSE_INKEDIT + // First test if we can load an ink edit control. Normally, all edit + // controls will be made ink edit controls if a tablet environment is + // found (or if msw.inkedit != 0 and the InkEd.dll is present). + // However, an application can veto ink edit controls by either specifying + // msw.inkedit = 0 or by removing wxTE_RICH[2] from the style. + // + if ((wxSystemSettings::HasFeature(wxSYS_TABLET_PRESENT) || wxSystemOptions::GetOptionInt(wxT("msw.inkedit")) != 0) && + !(wxSystemOptions::HasOption(wxT("msw.inkedit")) && wxSystemOptions::GetOptionInt(wxT("msw.inkedit")) == 0)) { - // try to load the RichEdit DLL (will do nothing if already done) - if ( !wxRichEditModule::Load(verRichEdit) ) + if (wxRichEditModule::LoadInkEdit()) { -#if !wxUSE_UNICODE - // try another version? - verRichEdit = 3 - verRichEdit; // 1 <-> 2 + windowClass = INKEDIT_CLASS; - if ( !wxRichEditModule::Load(verRichEdit) ) -#endif // wxUSE_UNICODE - { - wxLogError(_("Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll")); +#if wxUSE_INKEDIT && wxUSE_RICHEDIT + m_isInkEdit = 1; +#endif - s_errorGiven = true; - } + // Fake rich text version for other calls + m_verRichEdit = 2; } } +#endif - // have we managed to load any richedit version? - if ( !s_errorGiven ) + if (!IsInkEdit()) { - m_verRichEdit = verRichEdit; - if ( m_verRichEdit == 1 ) - { - windowClass = wxT("RICHEDIT"); - } - else + if ( m_verRichEdit == 2 ) { -#ifndef RICHEDIT_CLASS - wxString RICHEDIT_CLASS; - RICHEDIT_CLASS.Printf(_T("RichEdit%d0"), m_verRichEdit); + if ( wxRichEditModule::Load(wxRichEditModule::Version_41) ) + { + // yes, class name for version 4.1 really is 5.0 + windowClass = _T("RICHEDIT50W"); + } + else if ( wxRichEditModule::Load(wxRichEditModule::Version_2or3) ) + { + windowClass = _T("RichEdit20") #if wxUSE_UNICODE - RICHEDIT_CLASS += _T('W'); + _T("W"); #else // ANSI - RICHEDIT_CLASS += _T('A'); + _T("A"); #endif // Unicode/ANSI -#endif // !RICHEDIT_CLASS + } + else // failed to load msftedit.dll and riched20.dll + { + m_verRichEdit = 1; + } + } + + if ( m_verRichEdit == 1 ) + { + if ( wxRichEditModule::Load(wxRichEditModule::Version_1) ) + { + windowClass = _T("RICHEDIT"); + } + else // failed to load any richedit control DLL + { + // only give the error msg once if the DLL can't be loaded + static bool s_errorGiven = false; // MT ok as only used by GUI + + if ( !s_errorGiven ) + { + wxLogError(_("Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll")); + + s_errorGiven = true; + } - windowClass = RICHEDIT_CLASS; + m_verRichEdit = 0; + } } - } + } // !useInkEdit } #endif // wxUSE_RICHEDIT @@ -343,23 +484,54 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, valueWin = value; } - if ( !MSWCreateControl(windowClass, msStyle, pos, size, valueWin) ) + // suppress events sent during control creation: we're called either from + // the ctor and then we shouldn't generate any events for compatibility + // with the other ports, or from SetWindowStyleFlag() and then we shouldn't + // generate the events because our text doesn't really change, the fact + // that we (sometimes) need to recreate the control is just an + // implementation detail + m_updatesCount = -2; + + if ( !MSWCreateControl(windowClass.wx_str(), msStyle, pos, size, valueWin) ) return false; - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); + m_updatesCount = -1; #if wxUSE_RICHEDIT - if ( IsRich() ) + if (IsRich()) { +#if wxUSE_INKEDIT + if (IsInkEdit()) + { + // Pass IEM_InsertText (0) as wParam, in order to have the ink always + // converted to text. + ::SendMessage(GetHwnd(), EM_SETINKINSERTMODE, 0, 0); + + // Make sure the mouse can be used for input + ::SendMessage(GetHwnd(), EM_SETUSEMOUSEFORINPUT, 1, 0); + } +#endif + // enable the events we're interested in: we want to get EN_CHANGE as // for the normal controls LPARAM mask = ENM_CHANGE; - if ( GetRichVersion() == 1 ) + if (GetRichVersion() == 1 && !IsInkEdit()) { // we also need EN_MSGFILTER for richedit 1.0 for the reasons // explained in its handler mask |= ENM_MOUSEEVENTS; + + // we also need to force the appearance of the vertical scrollbar + // initially as otherwise the control doesn't refresh correctly + // after resize: but once the vertical scrollbar had been shown + // (even if it's subsequently hidden) it does + // + // this is clearly a bug and for now it has been only noticed under + // Windows XP, so if we're sure it works correctly under other + // systems we could do this only for XP + SetSize(-1, 1); // 1 is small enough to force vert scrollbar + SetInitialSize(size); } else if ( m_windowStyle & wxTE_AUTO_URL ) { @@ -372,6 +544,14 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, } #endif // wxUSE_RICHEDIT +#ifndef __WXWINCE__ + // Without this, if we pass the size in the constructor and then don't change it, + // the themed borders will be drawn incorrectly. + SetWindowPos(GetHwnd(), NULL, 0, 0, 0, 0, + SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE| + SWP_FRAMECHANGED); +#endif + return true; } @@ -421,12 +601,9 @@ WXDWORD wxTextCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const { long msStyle = wxControl::MSWGetStyle(style, exstyle); - // styles which we alaways add by default + // styles which we always add by default if ( style & wxTE_MULTILINE ) { - wxASSERT_MSG( !(style & wxTE_PROCESS_ENTER), - wxT("wxTE_PROCESS_ENTER style is ignored for multiline text controls (they always process it)") ); - msStyle |= ES_MULTILINE | ES_WANTRETURN; if ( !(style & wxTE_NO_VSCROLL) ) { @@ -488,6 +665,62 @@ WXDWORD wxTextCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const void wxTextCtrl::SetWindowStyleFlag(long style) { + // changing the alignment of the control dynamically works under Win2003 + // (but not older Windows version: it seems to work under some versions of + // XP but not other ones, and we have no way to determine it so be + // conservative here) and only for plain EDIT controls (not RICH ones) and + // we have to recreate the control to make it always work + if ( IsRich() || wxGetWinVersion() < wxWinVersion_2003 ) + { + const long alignMask = wxTE_LEFT | wxTE_CENTRE | wxTE_RIGHT; + if ( (style & alignMask) != (GetWindowStyle() & alignMask) ) + { + const wxString value = GetValue(); + const wxPoint pos = GetPosition(); + const wxSize size = GetSize(); + + // delete the old window + HWND hwnd = GetHwnd(); + DissociateHandle(); + ::DestroyWindow(hwnd); + + // create the new one with the updated flags + m_windowStyle = style; + MSWCreateText(value, pos, size); + + // and make sure it has the same attributes as before + if ( m_hasFont ) + { + // calling SetFont(m_font) would do nothing as the code would + // notice that the font didn't change, so force it to believe + // that it did + wxFont font = m_font; + m_font = wxNullFont; + SetFont(font); + } + + if ( m_hasFgCol ) + { + wxColour colFg = m_foregroundColour; + m_foregroundColour = wxNullColour; + SetForegroundColour(colFg); + } + + if ( m_hasBgCol ) + { + wxColour colBg = m_backgroundColour; + m_backgroundColour = wxNullColour; + SetBackgroundColour(colBg); + } + + // note that text styles are lost but this is probably not a big + // problem: if you use styles, you probably don't use nor change + // alignment flags anyhow + + return; + } + } + #if wxUSE_RICHEDIT // we have to deal with some styles separately because they can't be // changed by simply calling SetWindowLong(GWL_STYLE) but can be changed @@ -509,6 +742,15 @@ void wxTextCtrl::SetWindowStyleFlag(long style) // set/get the controls text // ---------------------------------------------------------------------------- +bool wxTextCtrl::IsEmpty() const +{ + // this is an optimization for multiline controls containing a lot of text + if ( IsMultiLine() && GetNumberOfLines() != 1 ) + return false; + + return wxTextCtrlBase::IsEmpty(); +} + wxString wxTextCtrl::GetValue() const { // range 0..-1 is special for GetRange() and means to retrieve all text @@ -553,10 +795,12 @@ wxString wxTextCtrl::GetRange(long from, long to) const encoding = font.GetEncoding(); } +#if wxUSE_INTL if ( encoding == wxFONTENCODING_SYSTEM ) { encoding = wxLocale::GetSystemEncoding(); } +#endif // wxUSE_INTL if ( encoding == wxFONTENCODING_SYSTEM ) { @@ -632,7 +876,7 @@ wxString wxTextCtrl::GetRange(long from, long to) const return str; } -void wxTextCtrl::SetValue(const wxString& value) +void wxTextCtrl::DoSetValue(const wxString& value, int flags) { // if the text is long enough, it's faster to just set it instead of first // comparing it with the old one (chances are that it will be different @@ -640,22 +884,27 @@ void wxTextCtrl::SetValue(const wxString& value) // edit controls mostly) if ( (value.length() > 0x400) || (value != GetValue()) ) { - DoWriteText(value, false /* not selection only */); + DoWriteText(value, flags /* doesn't include SelectionOnly here */); + + // mark the control as being not dirty - we changed its text, not the + // user + DiscardEdits(); // for compatibility, don't move the cursor when doing SetValue() SetInsertionPoint(0); } else // same text { + // still reset the modified flag even if the value didn't really change + // because now it comes from the program and not the user (and do it + // before generating the event so that the event handler could get the + // expected value from IsModified()) + DiscardEdits(); + // still send an event for consistency - SendUpdateEvent(); + if (flags & SetValue_SendEvent) + SendUpdateEvent(); } - - // we should reset the modified flag even if the value didn't really change - - // mark the control as being not dirty - we changed its text, not the - // user - DiscardEdits(); } #if wxUSE_RICHEDIT && (!wxUSE_UNICODE || wxUSE_UNICODE_MSLU) @@ -736,17 +985,15 @@ wxTextCtrl::StreamIn(const wxString& value, #else // !wxUSE_UNICODE_MSLU wxCSConv conv(encoding); - const size_t len = conv.MB2WC(NULL, value, value.length()); + const size_t len = conv.MB2WC(NULL, value.mb_str(), value.length()); -#if wxUSE_WCHAR_T - wxWCharBuffer wchBuf(len); + if (len == wxCONV_FAILED) + return false; + + wxWCharBuffer wchBuf(len); // allocates one extra character wchar_t *wpc = wchBuf.data(); -#else - wchar_t *wchBuf = (wchar_t *)malloc((len + 1)*sizeof(wchar_t)); - wchar_t *wpc = wchBuf; -#endif - conv.MB2WC(wpc, value, value.length()); + conv.MB2WC(wpc, value.mb_str(), len + 1); #endif // wxUSE_UNICODE_MSLU // finally, stream it in the control @@ -756,13 +1003,8 @@ wxTextCtrl::StreamIn(const wxString& value, // the cast below is needed for broken (very) old mingw32 headers eds.pfnCallback = (EDITSTREAMCALLBACK)wxRichEditStreamIn; - // we're going to receive 2 EN_CHANGE notifications if we got any selection - // (same problem as in DoWriteText()) - if ( selectionOnly && HasSelection() ) - { - // so suppress one of them - m_suppressNextUpdate = true; - } + // same problem as in DoWriteText(): we can get multiple events here + UpdatesCountFilter ucf(m_updatesCount); ::SendMessage(GetHwnd(), EM_STREAMIN, SF_TEXT | @@ -770,6 +1012,11 @@ wxTextCtrl::StreamIn(const wxString& value, (selectionOnly ? SFF_SELECTION : 0), (LPARAM)&eds); + // 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?") ); + if ( eds.dwError ) { wxLogLastError(_T("EM_STREAMIN")); @@ -830,7 +1077,8 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const // conversion but what else can we do) wxCSConv conv(encoding); size_t lenNeeded = conv.WC2MB(NULL, wchBuf, 0); - if ( lenNeeded++ ) + + if ( lenNeeded != wxCONV_FAILED && lenNeeded++ ) { conv.WC2MB(wxStringBuffer(out, lenNeeded), wchBuf, lenNeeded); } @@ -852,8 +1100,9 @@ void wxTextCtrl::WriteText(const wxString& value) DoWriteText(value); } -void wxTextCtrl::DoWriteText(const wxString& value, bool selectionOnly) +void wxTextCtrl::DoWriteText(const wxString& value, int flags) { + bool selectionOnly = (flags & SetValue_SelectionOnly) != 0; wxString valueDos; if ( m_windowStyle & wxTE_MULTILINE ) valueDos = wxTextFile::Translate(value, wxTextFileType_Dos); @@ -911,50 +1160,35 @@ void wxTextCtrl::DoWriteText(const wxString& value, bool selectionOnly) #endif // wxUSE_RICHEDIT { // in some cases we get 2 EN_CHANGE notifications after the SendMessage - // call below which is confusing for the client code and so should be - // avoided - // - // these cases are: (a) plain EDIT controls if EM_REPLACESEL is used - // and there is a non empty selection currently and (b) rich text - // controls in any case - if ( -#if wxUSE_RICHEDIT - IsRich() || -#endif // wxUSE_RICHEDIT - (selectionOnly && HasSelection()) ) - { - m_suppressNextUpdate = true; - } + // call (this happens for plain EDITs with EM_REPLACESEL and under some + // -- undetermined -- conditions with rich edit) and sometimes we don't + // get any events at all (plain EDIT with WM_SETTEXT), so ensure that + // we generate exactly one of them by ignoring all but the first one in + // SendUpdateEvent() and generating one ourselves if we hadn't got any + // notifications from Windows + if ( !(flags & SetValue_SendEvent) ) + m_updatesCount = -2; // suppress any update event + + UpdatesCountFilter ucf(m_updatesCount); ::SendMessage(GetHwnd(), selectionOnly ? EM_REPLACESEL : WM_SETTEXT, - 0, (LPARAM)valueDos.c_str()); + // EM_REPLACESEL takes 1 to indicate the operation should be redoable + selectionOnly ? 1 : 0, (LPARAM)valueDos.wx_str()); - // OTOH, non rich text controls don't generate any events at all when - // we use WM_SETTEXT -- have to emulate them here - if ( !selectionOnly -#if wxUSE_RICHEDIT - && !IsRich() -#endif // wxUSE_RICHEDIT - ) + if ( !ucf.GotUpdate() && (flags & SetValue_SendEvent) ) { - // Windows already sends an update event for single-line - // controls. - if ( m_windowStyle & wxTE_MULTILINE ) - SendUpdateEvent(); + SendUpdateEvent(); } } - - AdjustSpaceLimit(); } void wxTextCtrl::AppendText(const wxString& text) { - SetInsertionPointEnd(); - - WriteText(text); + wxTextEntry::AppendText(text); #if wxUSE_RICHEDIT - if ( IsMultiLine() && GetRichVersion() > 1 ) + // 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 @@ -967,18 +1201,12 @@ void wxTextCtrl::Clear() { ::SetWindowText(GetHwnd(), wxEmptyString); -#if wxUSE_RICHEDIT - if ( !IsRich() ) -#endif // wxUSE_RICHEDIT + if ( IsMultiLine() && !IsRich() ) { // rich edit controls send EN_UPDATE from WM_SETTEXT handler themselves // but the normal ones don't -- make Clear() behaviour consistent by // always sending this event - - // Windows already sends an update event for single-line - // controls. - if ( m_windowStyle & wxTE_MULTILINE ) - SendUpdateEvent(); + SendUpdateEvent(); } } @@ -1001,91 +1229,10 @@ bool wxTextCtrl::EmulateKeyPress(const wxKeyEvent& event) #endif // __WIN32__ -// ---------------------------------------------------------------------------- -// Clipboard operations -// ---------------------------------------------------------------------------- - -void wxTextCtrl::Copy() -{ - if (CanCopy()) - { - ::SendMessage(GetHwnd(), WM_COPY, 0, 0L); - } -} - -void wxTextCtrl::Cut() -{ - if (CanCut()) - { - ::SendMessage(GetHwnd(), WM_CUT, 0, 0L); - } -} - -void wxTextCtrl::Paste() -{ - if (CanPaste()) - { - ::SendMessage(GetHwnd(), WM_PASTE, 0, 0L); - } -} - -bool wxTextCtrl::HasSelection() const -{ - long from, to; - GetSelection(&from, &to); - return from != to; -} - -bool wxTextCtrl::CanCopy() const -{ - // Can copy if there's a selection - return HasSelection(); -} - -bool wxTextCtrl::CanCut() const -{ - return CanCopy() && IsEditable(); -} - -bool wxTextCtrl::CanPaste() const -{ - if ( !IsEditable() ) - return false; - -#if wxUSE_RICHEDIT - if ( IsRich() ) - { - UINT cf = 0; // 0 == any format - - return ::SendMessage(GetHwnd(), EM_CANPASTE, cf, 0) != 0; - } -#endif // wxUSE_RICHEDIT - - // Standard edit control: check for straight text on clipboard - if ( !::OpenClipboard(GetHwndOf(wxTheApp->GetTopWindow())) ) - return false; - - bool isTextAvailable = ::IsClipboardFormatAvailable(CF_TEXT) != 0; - ::CloseClipboard(); - - return isTextAvailable; -} - // ---------------------------------------------------------------------------- // Accessors // ---------------------------------------------------------------------------- -void wxTextCtrl::SetEditable(bool editable) -{ - HWND hWnd = GetHwnd(); - ::SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L); -} - -void wxTextCtrl::SetInsertionPoint(long pos) -{ - DoSetSelection(pos, pos); -} - void wxTextCtrl::SetInsertionPointEnd() { // we must not do anything if the caret is already there because calling @@ -1093,24 +1240,13 @@ void wxTextCtrl::SetInsertionPointEnd() // if it doesn't actually move the caret anywhere and so the simple fact of // doing it results in horrible flicker when appending big amounts of text // to the control in a few chunks (see DoAddText() test in the text sample) - if ( GetInsertionPoint() == GetLastPosition() ) - return; - - long pos; - -#if wxUSE_RICHEDIT - if ( m_verRichEdit == 1 ) - { - // we don't have to waste time calling GetLastPosition() in this case - pos = -1; - } - else // !RichEdit 1.0 -#endif // wxUSE_RICHEDIT + const wxTextPos lastPosition = GetLastPosition(); + if ( GetInsertionPoint() == lastPosition ) { - pos = GetLastPosition(); + return; } - SetInsertionPoint(pos); + SetInsertionPoint(lastPosition); } long wxTextCtrl::GetInsertionPoint() const @@ -1126,23 +1262,27 @@ long wxTextCtrl::GetInsertionPoint() const } #endif // wxUSE_RICHEDIT - DWORD Pos = (DWORD)::SendMessage(GetHwnd(), EM_GETSEL, 0, 0L); - return Pos & 0xFFFF; + return wxTextEntry::GetInsertionPoint(); } -long wxTextCtrl::GetLastPosition() const +wxTextPos wxTextCtrl::GetLastPosition() const { - int numLines = GetNumberOfLines(); - long posStartLastLine = XYToPosition(0, numLines - 1); + if ( IsMultiLine() ) + { + int numLines = GetNumberOfLines(); + long posStartLastLine = XYToPosition(0, numLines - 1); + + long lenLastLine = GetLengthOfLineContainingPos(posStartLastLine); - long lenLastLine = GetLengthOfLineContainingPos(posStartLastLine); + return posStartLastLine + lenLastLine; + } - return posStartLastLine + lenLastLine; + return wxTextEntry::GetLastPosition(); } // If the return values from and to are the same, there is no // selection. -void wxTextCtrl::GetSelection(long* from, long* to) const +void wxTextCtrl::GetSelection(long *from, long *to) const { #if wxUSE_RICHEDIT if ( IsRich() ) @@ -1156,63 +1296,40 @@ void wxTextCtrl::GetSelection(long* from, long* to) const else #endif // !wxUSE_RICHEDIT { - DWORD dwStart, dwEnd; - ::SendMessage(GetHwnd(), EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); - - *from = dwStart; - *to = dwEnd; + wxTextEntry::GetSelection(from, to); } } -bool wxTextCtrl::IsEditable() const -{ - // strangely enough, we may be called before the control is created: our - // own Create() calls MSWGetStyle() which calls AcceptsFocus() which calls - // us - if ( !m_hWnd ) - return true; - - long style = ::GetWindowLong(GetHwnd(), GWL_STYLE); - - return (style & ES_READONLY) == 0; -} - // ---------------------------------------------------------------------------- // selection // ---------------------------------------------------------------------------- -void wxTextCtrl::SetSelection(long from, long to) -{ - // if from and to are both -1, it means (in wxWidgets) that all text should - // be selected - translate into Windows convention - if ( (from == -1) && (to == -1) ) - { - from = 0; - to = -1; - } - - DoSetSelection(from, to); -} - -void wxTextCtrl::DoSetSelection(long from, long to, bool scrollCaret) +void wxTextCtrl::DoSetSelection(long from, long to, int flags) { HWND hWnd = GetHwnd(); #if wxUSE_RICHEDIT if ( IsRich() ) { + // if from and to are both -1, it means (in wxWidgets) that all text + // should be selected, translate this into Windows convention + if ( (from == -1) && (to == -1) ) + { + from = 0; + } + CHARRANGE range; range.cpMin = from; range.cpMax = to; - ::SendMessage(hWnd, EM_EXSETSEL, 0, (LPARAM) &range); + ::SendMessage(hWnd, EM_EXSETSEL, 0, (LPARAM)&range); } else #endif // wxUSE_RICHEDIT { - ::SendMessage(hWnd, EM_SETSEL, (WPARAM)from, (LPARAM)to); + wxTextEntry::DoSetSelection(from, to, flags); } - if ( scrollCaret ) + if ( (flags & SetSel_Scroll) && !IsFrozen() ) { #if wxUSE_RICHEDIT // richedit 3.0 (i.e. the version living in riched20.dll distributed @@ -1231,10 +1348,14 @@ void wxTextCtrl::DoSetSelection(long from, long to, bool scrollCaret) // ES_DISABLENOSCROLL // // this is very ugly but I don't see any other way to make this work + long style = 0; if ( GetRichVersion() > 1 ) { if ( !HasFlag(wxTE_NOHIDESEL) ) { + // setting ECO_NOHIDESEL also sets WS_VISIBLE and possibly + // others, remember the style so we can reset it later if needed + style = ::GetWindowLong(GetHwnd(), GWL_STYLE); ::SendMessage(GetHwnd(), EM_SETOPTIONS, ECOOP_OR, ECO_NOHIDESEL); } @@ -1242,7 +1363,7 @@ void wxTextCtrl::DoSetSelection(long from, long to, bool scrollCaret) } #endif // wxUSE_RICHEDIT - ::SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0); + ::SendMessage(hWnd, EM_SCROLLCARET, 0, (LPARAM)0); #if wxUSE_RICHEDIT // restore ECO_NOHIDESEL if we changed it @@ -1250,6 +1371,8 @@ void wxTextCtrl::DoSetSelection(long from, long to, bool scrollCaret) { ::SendMessage(GetHwnd(), EM_SETOPTIONS, ECOOP_AND, ~ECO_NOHIDESEL); + if ( style != ::GetWindowLong(GetHwnd(), GWL_STYLE) ) + ::SetWindowLong(GetHwnd(), GWL_STYLE, style); } #endif // wxUSE_RICHEDIT } @@ -1259,9 +1382,9 @@ void wxTextCtrl::DoSetSelection(long from, long to, bool scrollCaret) // Working with files // ---------------------------------------------------------------------------- -bool wxTextCtrl::LoadFile(const wxString& file) +bool wxTextCtrl::DoLoadFile(const wxString& file, int fileType) { - if ( wxTextCtrlBase::LoadFile(file) ) + if ( wxTextCtrlBase::DoLoadFile(file, fileType) ) { // update the size limit if needed AdjustSpaceLimit(); @@ -1273,22 +1396,9 @@ bool wxTextCtrl::LoadFile(const wxString& file) } // ---------------------------------------------------------------------------- -// Editing +// dirty status // ---------------------------------------------------------------------------- -void wxTextCtrl::Replace(long from, long to, const wxString& value) -{ - // Set selection and remove it - DoSetSelection(from, to, false /* don't scroll caret into view */); - - DoWriteText(value, true /* selection only */); -} - -void wxTextCtrl::Remove(long from, long to) -{ - Replace(from, to, wxEmptyString); -} - bool wxTextCtrl::IsModified() const { return ::SendMessage(GetHwnd(), EM_GETMODIFY, 0, 0) != 0; @@ -1296,27 +1406,27 @@ bool wxTextCtrl::IsModified() const void wxTextCtrl::MarkDirty() { - ::SendMessage(GetHwnd(), EM_SETMODIFY, TRUE, 0L); + ::SendMessage(GetHwnd(), EM_SETMODIFY, TRUE, 0); } void wxTextCtrl::DiscardEdits() { - ::SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L); -} - -int wxTextCtrl::GetNumberOfLines() const -{ - return (int)::SendMessage(GetHwnd(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0); + ::SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0); } // ---------------------------------------------------------------------------- // Positions <-> coords // ---------------------------------------------------------------------------- +int wxTextCtrl::GetNumberOfLines() const +{ + return (int)::SendMessage(GetHwnd(), EM_GETLINECOUNT, 0, 0); +} + long wxTextCtrl::XYToPosition(long x, long y) const { // This gets the char index for the _beginning_ of this line - long charIndex = ::SendMessage(GetHwnd(), EM_LINEINDEX, (WPARAM)y, (LPARAM)0); + long charIndex = ::SendMessage(GetHwnd(), EM_LINEINDEX, y, 0); return charIndex + x; } @@ -1330,12 +1440,12 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const #if wxUSE_RICHEDIT if ( IsRich() ) { - lineNo = ::SendMessage(hWnd, EM_EXLINEFROMCHAR, 0, (LPARAM)pos); + lineNo = ::SendMessage(hWnd, EM_EXLINEFROMCHAR, 0, pos); } else #endif // wxUSE_RICHEDIT { - lineNo = ::SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, 0); + lineNo = ::SendMessage(hWnd, EM_LINEFROMCHAR, pos, 0); } if ( lineNo == -1 ) @@ -1345,7 +1455,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const } // This gets the char index for the _beginning_ of this line - long charIndex = ::SendMessage(hWnd, EM_LINEINDEX, (WPARAM)lineNo, (LPARAM)0); + long charIndex = ::SendMessage(hWnd, EM_LINEINDEX, lineNo, 0); if ( charIndex == -1 ) { return false; @@ -1463,21 +1573,21 @@ void wxTextCtrl::ShowPosition(long pos) // Is this where scrolling is relative to - the line containing the caret? // Or is the first visible line??? Try first visible line. -// int currentLineLineNo1 = (int)::SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)-1, (LPARAM)0L); +// int currentLineLineNo1 = (int)::SendMessage(hWnd, EM_LINEFROMCHAR, -1, 0L); - int currentLineLineNo = (int)::SendMessage(hWnd, EM_GETFIRSTVISIBLELINE, (WPARAM)0, (LPARAM)0L); + int currentLineLineNo = (int)::SendMessage(hWnd, EM_GETFIRSTVISIBLELINE, 0, 0); - int specifiedLineLineNo = (int)::SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, (LPARAM)0L); + int specifiedLineLineNo = (int)::SendMessage(hWnd, EM_LINEFROMCHAR, pos, 0); int linesToScroll = specifiedLineLineNo - currentLineLineNo; if (linesToScroll != 0) - (void)::SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)linesToScroll); + ::SendMessage(hWnd, EM_LINESCROLL, 0, linesToScroll); } long wxTextCtrl::GetLengthOfLineContainingPos(long pos) const { - return ::SendMessage(GetHwnd(), EM_LINELENGTH, (WPARAM)pos, 0); + return ::SendMessage(GetHwnd(), EM_LINELENGTH, pos, 0); } int wxTextCtrl::GetLineLength(long lineNo) const @@ -1510,9 +1620,16 @@ wxString wxTextCtrl::GetLineText(long lineNo) const // should never see it if ( buf[len - 2] == _T('\r') && buf[len - 1] == _T('\n') ) { + // richedit 1.0 uses "\r\n" as line terminator, so remove "\r" + // here and "\n" below buf[len - 2] = _T('\n'); len--; } + else if ( buf[len - 1] == _T('\r') ) + { + // richedit 2.0+ uses only "\r", replace it with "\n" + buf[len - 1] = _T('\n'); + } } #endif // wxUSE_RICHEDIT @@ -1533,52 +1650,42 @@ wxString wxTextCtrl::GetLineText(long lineNo) const void wxTextCtrl::SetMaxLength(unsigned long len) { #if wxUSE_RICHEDIT - if (IsRich()) - ::SendMessage(GetHwnd(), EM_EXLIMITTEXT, 0, (LPARAM) (DWORD) len); + if ( IsRich() ) + { + ::SendMessage(GetHwnd(), EM_EXLIMITTEXT, 0, len ? len : 0x7fffffff); + } else -#endif - ::SendMessage(GetHwnd(), EM_LIMITTEXT, len, 0); +#endif // wxUSE_RICHEDIT + { + wxTextEntry::SetMaxLength(len); + } } // ---------------------------------------------------------------------------- // Undo/redo // ---------------------------------------------------------------------------- -void wxTextCtrl::Undo() -{ - if (CanUndo()) - { - ::SendMessage(GetHwnd(), EM_UNDO, 0, 0); - } -} - void wxTextCtrl::Redo() { - if (CanRedo()) - { #if wxUSE_RICHEDIT - if (GetRichVersion() > 1) - ::SendMessage(GetHwnd(), EM_REDO, 0, 0); - else -#endif - // Same as Undo, since Undo undoes the undo, i.e. a redo. - ::SendMessage(GetHwnd(), EM_UNDO, 0, 0); + if ( GetRichVersion() > 1 ) + { + ::SendMessage(GetHwnd(), EM_REDO, 0, 0); + return; } -} +#endif // wxUSE_RICHEDIT -bool wxTextCtrl::CanUndo() const -{ - return ::SendMessage(GetHwnd(), EM_CANUNDO, 0, 0) != 0; + wxTextEntry::Redo(); } bool wxTextCtrl::CanRedo() const { #if wxUSE_RICHEDIT - if (GetRichVersion() > 1) + if ( GetRichVersion() > 1 ) return ::SendMessage(GetHwnd(), EM_CANREDO, 0, 0) != 0; - else -#endif - return ::SendMessage(GetHwnd(), EM_CANUNDO, 0, 0) != 0; +#endif // wxUSE_RICHEDIT + + return wxTextEntry::CanRedo(); } // ---------------------------------------------------------------------------- @@ -1592,7 +1699,7 @@ bool wxTextCtrl::ShowNativeCaret(bool show) if ( !(show ? ::ShowCaret(GetHwnd()) : ::HideCaret(GetHwnd())) ) { // not an error, may simply indicate that it's not shown/hidden - // yet (i.e. it had been hidden/showh 2 times before) + // yet (i.e. it had been hidden/shown 2 times before) return false; } @@ -1603,7 +1710,7 @@ bool wxTextCtrl::ShowNativeCaret(bool show) } // ---------------------------------------------------------------------------- -// implemenation details +// implementation details // ---------------------------------------------------------------------------- void wxTextCtrl::Command(wxCommandEvent & event) @@ -1625,18 +1732,17 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event) // kbd input processing // ---------------------------------------------------------------------------- -bool wxTextCtrl::MSWShouldPreProcessMessage(WXMSG* pMsg) +bool wxTextCtrl::MSWShouldPreProcessMessage(WXMSG* msg) { - 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 = (WORD) msg->wParam; - if ( (HIWORD(msg->lParam) & KF_ALTDOWN) == KF_ALTDOWN ) + const WPARAM vkey = msg->wParam; + if ( HIWORD(msg->lParam) & KF_ALTDOWN ) { + // Alt-Backspace is accelerator for "Undo" if ( vkey == VK_BACK ) return false; } @@ -1654,6 +1760,9 @@ bool wxTextCtrl::MSWShouldPreProcessMessage(WXMSG* pMsg) // fall through case 0: + if ( IsMultiLine() && vkey == VK_RETURN ) + return false; + // fall through case 2: break; @@ -1682,7 +1791,7 @@ bool wxTextCtrl::MSWShouldPreProcessMessage(WXMSG* pMsg) } } - return wxControl::MSWShouldPreProcessMessage(pMsg); + return wxControl::MSWShouldPreProcessMessage(msg); } void wxTextCtrl::OnChar(wxKeyEvent& event) @@ -1690,16 +1799,15 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) switch ( event.GetKeyCode() ) { case WXK_RETURN: - if ( !HasFlag(wxTE_MULTILINE) ) { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); InitCommandEvent(event); event.SetString(GetValue()); - if ( GetEventHandler()->ProcessEvent(event) ) + if ( HandleWindowEvent(event) ) + if ( !HasFlag(wxTE_MULTILINE) ) return; + //else: multiline controls need Enter for themselves } - //else: multiline controls need Enter for themselves - break; case WXK_TAB: @@ -1735,6 +1843,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) // Insert tab since calling the default Windows handler // doesn't seem to do it WriteText(wxT("\t")); + return; } break; } @@ -1743,45 +1852,79 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) event.Skip(); } +void wxTextCtrl::OnKeyDown(wxKeyEvent& event) +{ + // richedit control doesn't send WM_PASTE, WM_CUT and WM_COPY messages + // when Ctrl-V, X or C is pressed and this prevents wxClipboardTextEvent + // from working. So we work around it by intercepting these shortcuts + // ourselves and emitting clipboard events (which richedit will handle, + // so everything works as before, including pasting of rich text): + if ( event.GetModifiers() == wxMOD_CONTROL && IsRich() ) + { + switch ( event.GetKeyCode() ) + { + case 'C': + Copy(); + return; + case 'X': + Cut(); + return; + case 'V': + Paste(); + return; + default: + break; + } + } + + // no, we didn't process it + event.Skip(); +} + WXLRESULT wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { WXLRESULT lRc = wxTextCtrlBase::MSWWindowProc(nMsg, wParam, lParam); - if ( nMsg == WM_GETDLGCODE ) + switch ( nMsg ) { - // we always want the chars and the arrows: the arrows for navigation - // and the chars because we want Ctrl-C to work even in a read only - // control - long lDlgCode = DLGC_WANTCHARS | DLGC_WANTARROWS; + case WM_GETDLGCODE: + { + // we always want the chars and the arrows: the arrows for + // navigation and the chars because we want Ctrl-C to work even + // in a read only control + long lDlgCode = DLGC_WANTCHARS | DLGC_WANTARROWS; - if ( IsEditable() ) - { - // we may have several different cases: - // 1. normal case: both TAB and ENTER are used for dlg navigation - // 2. ctrl which wants TAB for itself: ENTER is used to pass to the - // next control in the dialog - // 3. ctrl which wants ENTER for itself: TAB is used for dialog - // navigation - // 4. ctrl which wants both TAB and ENTER: Ctrl-ENTER is used to go - // to the next control - - // the multiline edit control should always get for itself - if ( HasFlag(wxTE_PROCESS_ENTER) || HasFlag(wxTE_MULTILINE) ) - lDlgCode |= DLGC_WANTMESSAGE; - - if ( HasFlag(wxTE_PROCESS_TAB) ) - lDlgCode |= DLGC_WANTTAB; - - lRc |= lDlgCode; - } - else // !editable - { - // NB: use "=", not "|=" as the base class version returns the - // same flags is this state as usual (i.e. including - // DLGC_WANTMESSAGE). This is strange (how does it work in the - // native Win32 apps?) but for now live with it. - lRc = lDlgCode; - } + if ( IsEditable() ) + { + // we may have several different cases: + // 1. normal: both TAB and ENTER are used for navigation + // 2. ctrl wants TAB for itself: ENTER is used to pass to + // the next control in the dialog + // 3. ctrl wants ENTER for itself: TAB is used for dialog + // navigation + // 4. ctrl wants both TAB and ENTER: Ctrl-ENTER is used to + // go to the next control (we need some way to do it) + + // multiline controls should always get ENTER for themselves + if ( HasFlag(wxTE_PROCESS_ENTER) || HasFlag(wxTE_MULTILINE) ) + lDlgCode |= DLGC_WANTMESSAGE; + + if ( HasFlag(wxTE_PROCESS_TAB) ) + lDlgCode |= DLGC_WANTTAB; + + lRc |= lDlgCode; + } + else // !editable + { + // NB: use "=", not "|=" as the base class version returns + // the same flags in the disabled state as usual (i.e. + // including DLGC_WANTMESSAGE). This is strange (how + // does it work in the native Win32 apps?) but for now + // live with it. + lRc = lDlgCode; + } + } + break; } return lRc; @@ -1793,37 +1936,39 @@ WXLRESULT wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara bool wxTextCtrl::SendUpdateEvent() { - // is event reporting suspended? - if ( m_suppressNextUpdate ) + switch ( m_updatesCount ) { - // do process the next one - m_suppressNextUpdate = false; + case 0: + // remember that we've got an update + m_updatesCount++; + break; - return false; - } + case 1: + // we had already sent one event since the last control modification + return false; - wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId()); - InitCommandEvent(event); - event.SetString(GetValue()); + default: + wxFAIL_MSG( _T("unexpected wxTextCtrl::m_updatesCount value") ); + // fall through + + case -1: + // we hadn't updated the control ourselves, this event comes from + // the user, don't need to ignore it nor update the count + break; + + case -2: + // the control was updated programmatically and we do NOT want to + // send events + return false; + } - return ProcessCommand(event); + return SendTextUpdatedEvent(); } bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { switch ( param ) { - case EN_SETFOCUS: - case EN_KILLFOCUS: - { - wxFocusEvent event(param == EN_KILLFOCUS ? wxEVT_KILL_FOCUS - : wxEVT_SET_FOCUS, - m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); - } - break; - case EN_CHANGE: SendUpdateEvent(); break; @@ -1839,7 +1984,9 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) } break; - // the other edit notification messages are not processed + // the other edit notification messages are not processed (or, in + // the case of EN_{SET/KILL}FOCUS were already handled at WM_SET/ + // KILLFOCUS level) default: return false; } @@ -1848,89 +1995,51 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) return true; } -WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor), -#if wxUSE_CTL3D - WXUINT message, - WXWPARAM wParam, - WXLPARAM lParam -#else - WXUINT WXUNUSED(message), - WXWPARAM WXUNUSED(wParam), - WXLPARAM WXUNUSED(lParam) -#endif - ) +WXHBRUSH wxTextCtrl::MSWControlColor(WXHDC hDC, WXHWND hWnd) { -#if wxUSE_CTL3D - if ( m_useCtl3D ) - { - HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); - return (WXHBRUSH) hbrush; - } -#endif // wxUSE_CTL3D - - HDC hdc = (HDC)pDC; - wxColour colBack = GetBackgroundColour(); - - if (!IsEnabled() && (GetWindowStyle() & wxTE_MULTILINE) == 0) - colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - - ::SetBkColor(hdc, wxColourToRGB(colBack)); - ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); - - wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID); + if ( !IsEnabled() && !HasFlag(wxTE_MULTILINE) ) + return MSWControlColorDisabled(hDC); - return (WXHBRUSH)brush->GetResourceHandle(); + return wxTextCtrlBase::MSWControlColor(hDC, hWnd); } -bool wxTextCtrl::AdjustSpaceLimit() +bool wxTextCtrl::HasSpaceLimit(unsigned int *len) const { - 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() + // Unfortunately there is no EM_GETLIMITTEXTSETBYUSER and so we don't + // know the limit we set (if any). 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 small values while EN_MAXTEXT is only sent + // for large values (in practice the default limit seems to be 30000 + // but make it smaller just to be on the safe side) + *len = ::SendMessage(GetHwnd(), EM_GETLIMITTEXT, 0, 0); + return *len < 10001; + +} + +bool wxTextCtrl::AdjustSpaceLimit() +{ + unsigned int limit; + if ( HasSpaceLimit(&limit) ) return false; - } unsigned int len = ::GetWindowTextLength(GetHwnd()); if ( len >= limit ) { - limit = len + 0x8000; // 32Kb - -#if wxUSE_RICHEDIT - if ( IsRich() ) - { - // as a nice side effect, this also allows passing limit > 64Kb - ::SendMessage(GetHwnd(), EM_EXLIMITTEXT, 0, limit); - } - else -#endif // wxUSE_RICHEDIT - { - if ( limit > 0xffff ) - { - // this will set it to a platform-dependent maximum (much more - // than 64Kb under NT) - limit = 0; - } - - ::SendMessage(GetHwnd(), EM_LIMITTEXT, limit, 0); - } + // increment in 32Kb chunks + SetMaxLength(len + 0x8000); } // we changed the limit return true; } -bool wxTextCtrl::AcceptsFocus() const +bool wxTextCtrl::AcceptsFocusFromKeyboard() const { // we don't want focus if we can't be edited unless we're a multiline // control because then it might be still nice to get focus from keyboard @@ -1948,7 +2057,7 @@ wxSize wxTextCtrl::DoGetBestSize() const int hText = cy; if ( m_windowStyle & wxTE_MULTILINE ) { - hText *= wxMax(GetNumberOfLines(), 5); + hText *= wxMax(wxMin(GetNumberOfLines(), 10), 2); } //else: for single line control everything is ok @@ -1990,15 +2099,12 @@ void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event)) void wxTextCtrl::OnDelete(wxCommandEvent& WXUNUSED(event)) { - long from, to; - GetSelection(& from, & to); - if (from != -1 && to != -1) - Remove(from, to); + RemoveSelection(); } void wxTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event)) { - SetSelection(-1, -1); + SelectAll(); } void wxTextCtrl::OnUpdateCut(wxUpdateUIEvent& event) @@ -2028,17 +2134,15 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) void wxTextCtrl::OnUpdateDelete(wxUpdateUIEvent& event) { - long from, to; - GetSelection(& from, & to); - event.Enable(from != -1 && to != -1 && from != to && IsEditable()) ; + event.Enable( HasSelection() && IsEditable() ); } void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event) { - event.Enable(GetLastPosition() > 0); + event.Enable( !IsEmpty() ); } -void wxTextCtrl::OnRightClick(wxMouseEvent& event) +void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event) { #if wxUSE_RICHEDIT if (IsRich()) @@ -2056,7 +2160,7 @@ void wxTextCtrl::OnRightClick(wxMouseEvent& event) m_privateContextMenu->AppendSeparator(); m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All")); } - PopupMenu(m_privateContextMenu, event.GetPosition()); + PopupMenu(m_privateContextMenu); return; } else @@ -2064,13 +2168,32 @@ void wxTextCtrl::OnRightClick(wxMouseEvent& event) event.Skip(); } -void wxTextCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event)) +void wxTextCtrl::OnSetFocus(wxFocusEvent& event) { // be sure the caret remains invisible if the user had hidden it if ( !m_isNativeCaretShown ) { ::HideCaret(GetHwnd()); } + + 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 @@ -2176,6 +2299,22 @@ bool wxTextCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) return wxTextCtrlBase::MSWOnNotify(idCtrl, lParam, result); } +#if wxUSE_DRAG_AND_DROP + +void wxTextCtrl::SetDropTarget(wxDropTarget *dropTarget) +{ + if ( m_dropTarget == wxRICHTEXT_DEFAULT_DROPTARGET ) + { + // get rid of the built-in drop target + ::RevokeDragDrop(GetHwnd()); + m_dropTarget = NULL; + } + + wxTextCtrlBase::SetDropTarget(dropTarget); +} + +#endif // wxUSE_DRAG_AND_DROP + // ---------------------------------------------------------------------------- // colour setting for the rich edit controls // ---------------------------------------------------------------------------- @@ -2224,8 +2363,6 @@ bool wxTextCtrl::SetForegroundColour(const wxColour& colour) // styling support for rich edit controls // ---------------------------------------------------------------------------- -#if wxUSE_RICHEDIT - bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) { if ( !IsRich() ) @@ -2263,7 +2400,7 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) if ( changeSel ) { - DoSetSelection(start, end, false /* don't scroll caret into view */); + DoSetSelection(start, end, SetSel_NoScroll); } // initialize CHARFORMAT struct @@ -2302,9 +2439,12 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) // the real height in twips and not the negative number which // wxFillLogFont() returns (this is correct in general and works with // the Windows font mapper, but not here) + + wxFont font(style.GetFont()); + LOGFONT lf; - wxFillLogFont(&lf, &style.GetFont()); - cf.yHeight = 20*style.GetFont().GetPointSize(); // 1 pt = 20 twips + wxFillLogFont(&lf, &font); + cf.yHeight = 20*font.GetPointSize(); // 1 pt = 20 twips cf.bCharSet = lf.lfCharSet; cf.bPitchAndFamily = lf.lfPitchAndFamily; wxStrncpy( cf.szFaceName, lf.lfFaceName, WXSIZEOF(cf.szFaceName) ); @@ -2415,11 +2555,23 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) } } - if (pf.dwMask != 0) +#if wxUSE_RICHEDIT2 + if ( m_verRichEdit > 1 ) + { + if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ) + { + // Use RTL paragraphs in RTL mode to get proper layout + pf.dwMask |= PFM_RTLPARA; + pf.wEffects |= PFE_RTLPARA; + } + } +#endif // wxUSE_RICHEDIT2 + + if ( pf.dwMask ) { // do format the selection bool ok = ::SendMessage(GetHwnd(), EM_SETPARAFORMAT, - 0, (LPARAM) &pf) != 0; + 0, (LPARAM) &pf) != 0; if ( !ok ) { wxLogDebug(_T("SendMessage(EM_SETPARAFORMAT, 0) failed")); @@ -2429,7 +2581,7 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) if ( changeSel ) { // restore the original selection - DoSetSelection(startOld, endOld, false); + DoSetSelection(startOld, endOld, SetSel_NoScroll); } return ok; @@ -2440,10 +2592,13 @@ bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style) if ( !wxTextCtrlBase::SetDefaultStyle(style) ) return false; - // we have to do this or the style wouldn't apply for the text typed by the - // user - long posLast = GetLastPosition(); - SetStyle(posLast, posLast, m_defaultStyle); + if ( IsEditable() ) + { + // we have to do this or the style wouldn't apply for the text typed by + // the user + wxTextPos posLast = GetLastPosition(); + SetStyle(posLast, posLast, m_defaultStyle); + } return true; } @@ -2489,7 +2644,7 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style) if ( changeSel ) { - DoSetSelection(position, position, false /* don't scroll caret into view */); + DoSetSelection(position, position + 1, SetSel_NoScroll); } // get the selection formatting @@ -2506,7 +2661,7 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style) wxStrcpy(lf.lfFaceName, cf.szFaceName); //NOTE: we _MUST_ set each of these values to _something_ since we - //do not call wxZeroMemory on the LOGFONT lf + //do not call wxZeroMemory on the LOGFONT lf if (cf.dwEffects & CFE_ITALIC) lf.lfItalic = TRUE; else @@ -2589,18 +2744,18 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style) if ( changeSel ) { // restore the original selection - DoSetSelection(startOld, endOld, false); + DoSetSelection(startOld, endOld, SetSel_NoScroll); } return true; } -#endif - // ---------------------------------------------------------------------------- // wxRichEditModule // ---------------------------------------------------------------------------- +static const HINSTANCE INVALID_HINSTANCE = (HINSTANCE)-1; + bool wxRichEditModule::OnInit() { // don't do anything - we will load it when needed @@ -2611,26 +2766,22 @@ void wxRichEditModule::OnExit() { for ( size_t i = 0; i < WXSIZEOF(ms_hRichEdit); i++ ) { - if ( ms_hRichEdit[i] ) + if ( ms_hRichEdit[i] && ms_hRichEdit[i] != INVALID_HINSTANCE ) { ::FreeLibrary(ms_hRichEdit[i]); ms_hRichEdit[i] = NULL; } } +#if wxUSE_INKEDIT + if (ms_inkEditLib.IsLoaded()) + ms_inkEditLib.Unload(); +#endif } /* static */ -bool wxRichEditModule::Load(int version) +bool wxRichEditModule::Load(Version version) { - // we don't support loading richedit 3.0 as I don't know how to distinguish - // it from 2.0 anyhow - wxCHECK_MSG( version == 1 || version == 2, false, - _T("incorrect richedit control version requested") ); - - // make it the index in the array - version--; - - if ( ms_hRichEdit[version] == (HINSTANCE)-1 ) + if ( ms_hRichEdit[version] == INVALID_HINSTANCE ) { // we had already tried to load it and failed return false; @@ -2642,16 +2793,21 @@ bool wxRichEditModule::Load(int version) return true; } - wxString dllname = version ? _T("riched20") : _T("riched32"); - dllname += _T(".dll"); + static const wxChar *dllnames[] = + { + _T("riched32"), + _T("riched20"), + _T("msftedit"), + }; + + wxCOMPILE_TIME_ASSERT( WXSIZEOF(dllnames) == Version_Max, + RichEditDllNamesVersionsMismatch ); - ms_hRichEdit[version] = ::LoadLibrary(dllname); + ms_hRichEdit[version] = ::LoadLibrary(dllnames[version]); if ( !ms_hRichEdit[version] ) { - wxLogSysError(_("Could not load Rich Edit DLL '%s'"), dllname.c_str()); - - ms_hRichEdit[version] = (HINSTANCE)-1; + ms_hRichEdit[version] = INVALID_HINSTANCE; return false; } @@ -2659,6 +2815,23 @@ bool wxRichEditModule::Load(int version) return true; } +#if wxUSE_INKEDIT +// load the InkEdit library +bool wxRichEditModule::LoadInkEdit() +{ + static wxDynamicLibrary ms_inkEditLib; + static bool ms_inkEditLibLoadAttemped; + if (ms_inkEditLibLoadAttemped) + ms_inkEditLib.IsLoaded(); + + ms_inkEditLibLoadAttemped = true; + + wxLogNull logNull; + return ms_inkEditLib.Load(wxT("inked")); +} +#endif // wxUSE_INKEDIT + + #endif // wxUSE_RICHEDIT #endif // wxUSE_TEXTCTRL && !(__SMARTPHONE__ && __WXWINCE__)