X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f882d57e937d30f118b8f0278bb147e90a528db6..1483041dab88f43563c26405c1e2a41d6babe6a0:/src/msw/textctrl.cpp diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 47d62a13a4..200b599bf4 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -95,6 +95,11 @@ #define SF_UNICODE 0x0010 #endif +// Watcom C++ doesn't define this +#ifndef SCF_ALL +#define SCF_ALL 0x0004 +#endif + // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- @@ -111,31 +116,24 @@ DWORD CALLBACK wxRichEditStreamIn(DWORD dwCookie, BYTE *buf, LONG cb, LONG *pcb) #if wxUSE_RICHEDIT -// this module initializes RichEdit DLL if needed +// this module initializes RichEdit DLL(s) if needed class wxRichEditModule : public wxModule { public: virtual bool OnInit(); virtual void OnExit(); - // get the version currently loaded, -1 if none - static int GetLoadedVersion() { return ms_verRichEdit; } - // load the richedit DLL of at least of required version static bool Load(int version = 1); private: - // the handle to richedit DLL and the version of the DLL loaded - static HINSTANCE ms_hRichEdit; - - // the DLL version loaded or -1 if none - static int ms_verRichEdit; + // the handles to richedit 1.0 and 2.0 (or 3.0) DLLs + static HINSTANCE ms_hRichEdit[2]; DECLARE_DYNAMIC_CLASS(wxRichEditModule) }; -HINSTANCE wxRichEditModule::ms_hRichEdit = (HINSTANCE)NULL; -int wxRichEditModule::ms_verRichEdit = -1; +HINSTANCE wxRichEditModule::ms_hRichEdit[2] = { NULL, NULL }; IMPLEMENT_DYNAMIC_CLASS(wxRichEditModule, wxModule) @@ -255,28 +253,63 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, wxString windowClass = wxT("EDIT"); #if wxUSE_RICHEDIT + if ( m_windowStyle & wxTE_AUTO_URL ) + { + // automatic URL detection only works in RichEdit 2.0+ + m_windowStyle |= wxTE_RICH2; + } + + if ( m_windowStyle & wxTE_RICH2 ) + { + // using richedit 2.0 implies using wxTE_RICH + m_windowStyle |= wxTE_RICH; + } + + // 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 + 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 + // + // 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) +#if wxUSE_UNICODE + const int verRichEdit = 2; +#else // !wxUSE_UNICODE + int 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 ) { - // first try to load the RichEdit DLL (will do nothing if already - // done) - if ( !wxRichEditModule::Load() ) + // try to load the RichEdit DLL (will do nothing if already done) + if ( !wxRichEditModule::Load(verRichEdit) ) { - wxLogError(_("Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll")); +#if !wxUSE_UNICODE + // try another version? + verRichEdit = 3 - verRichEdit; // 1 <-> 2 - s_errorGiven = TRUE; + if ( !wxRichEditModule::Load(verRichEdit) ) +#endif // wxUSE_UNICODE + { + wxLogError(_("Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll")); + + s_errorGiven = TRUE; + } } } + // have we managed to load any richedit version? if ( !s_errorGiven ) { msStyle |= ES_AUTOVSCROLL; - m_verRichEdit = wxRichEditModule::GetLoadedVersion(); + m_verRichEdit = verRichEdit; if ( m_verRichEdit == 1 ) { windowClass = wxT("RICHEDIT"); @@ -313,7 +346,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, if ( !MSWCreateControl(windowClass, msStyle, pos, size, valueWin) ) return FALSE; - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); #if wxUSE_RICHEDIT if ( IsRich() ) @@ -379,49 +412,77 @@ void wxTextCtrl::AdoptAttributesFromHWND() wxString wxTextCtrl::GetValue() const { - // we can't use wxGetWindowText() (i.e. WM_GETTEXT internally) for - // retrieving more than 64Kb under Win9x + // range 0..-1 is special for GetRange() and means to retrieve all text + return GetRange(0, -1); +} + +wxString wxTextCtrl::GetRange(long from, long to) const +{ + wxString str; + + if ( from >= to && to != -1 ) + { + // nothing to retrieve + return str; + } + #if wxUSE_RICHEDIT if ( IsRich() ) { - wxString str; - int len = GetWindowTextLength(GetHwnd()); - if ( len ) + if ( len > from ) { // alloc one extra WORD as needed by the control wxChar *p = str.GetWriteBuf(++len); TEXTRANGE textRange; - textRange.chrg.cpMin = 0; - textRange.chrg.cpMax = -1; + textRange.chrg.cpMin = from; + textRange.chrg.cpMax = to == -1 ? len : to; textRange.lpstrText = p; (void)SendMessage(GetHwnd(), EM_GETTEXTRANGE, 0, (LPARAM)&textRange); - // believe it or not, but EM_GETTEXTRANGE uses just CR ('\r') for - // the newlines which is neither Unix nor Windows style (Win95 with - // riched20.dll shows this behaviour) - convert it to something - // reasonable - for ( ; *p; p++ ) + if ( m_verRichEdit > 1 ) { - if ( *p == _T('\r') ) - *p = _T('\n'); + // RichEdit 2.0 uses just CR ('\r') for the newlines which is + // neither Unix nor Windows style - convert it to something + // reasonable + for ( ; *p; p++ ) + { + if ( *p == _T('\r') ) + *p = _T('\n'); + } } str.UngetWriteBuf(); + + if ( m_verRichEdit == 1 ) + { + // convert to the canonical form - see comment below + str = wxTextFile::Translate(str, wxTextFileType_Unix); + } } //else: no text at all, leave the string empty - - return str; } + else #endif // wxUSE_RICHEDIT + { + // retrieve all text + str = wxGetWindowText(GetHWND()); - // WM_GETTEXT uses standard DOS CR+LF (\r\n) convention - convert to the - // same one as above for consitency - wxString str = wxGetWindowText(GetHWND()); + // need only a range? + if ( from < to ) + { + str = str.Mid(from, to - from); + } - return wxTextFile::Translate(str, wxTextFileType_Unix); + // WM_GETTEXT uses standard DOS CR+LF (\r\n) convention - convert to the + // canonical one (same one as above) for consistency with the other kinds + // of controls and, more importantly, with the other ports + str = wxTextFile::Translate(str, wxTextFileType_Unix); + } + + return str; } void wxTextCtrl::SetValue(const wxString& value) @@ -432,11 +493,7 @@ void wxTextCtrl::SetValue(const wxString& value) // edit controls mostly) if ( (value.length() > 0x400) || (value != GetValue()) ) { - // it is simpler to do this but it could be more efficient to reproduce - // WriteText() logic here - Clear(); - - WriteText(value); + DoWriteText(value, FALSE /* not selection only */); // mark the control as being not dirty - we changed its text, not the // user @@ -447,7 +504,7 @@ void wxTextCtrl::SetValue(const wxString& value) } } -#if wxUSE_RICHEDIT && !wxUSE_UNICODE +#if wxUSE_RICHEDIT && (!wxUSE_UNICODE || wxUSE_UNICODE_MSLU) DWORD CALLBACK wxRichEditStreamIn(DWORD dwCookie, BYTE *buf, LONG cb, LONG *pcb) { @@ -470,7 +527,16 @@ DWORD CALLBACK wxRichEditStreamIn(DWORD dwCookie, BYTE *buf, LONG cb, LONG *pcb) extern long wxEncodingToCodepage(wxFontEncoding encoding); // from strconv.cpp -bool wxTextCtrl::StreamIn(const wxString& value, wxFontEncoding encoding) +#if wxUSE_UNICODE_MSLU +bool wxTextCtrl::StreamIn(const wxString& value, + wxFontEncoding WXUNUSED(encoding), + bool selectionOnly) +{ + const wchar_t *wpc = value.c_str(); +#else // !wxUSE_UNICODE_MSLU +bool wxTextCtrl::StreamIn(const wxString& value, + wxFontEncoding encoding, + bool selectionOnly) { // we have to use EM_STREAMIN to force richedit control 2.0+ to show any // text in the non default charset - otherwise it thinks it knows better @@ -486,15 +552,22 @@ bool wxTextCtrl::StreamIn(const wxString& value, wxFontEncoding encoding) // next translate to Unicode using this code page int len = ::MultiByteToWideChar(codepage, 0, value, -1, NULL, 0); + +#if wxUSE_WCHAR_T wxWCharBuffer wchBuf(len); +#else + wchar_t *wchBuf = (wchar_t *)malloc((len + 1)*sizeof(wchar_t)); +#endif + if ( !::MultiByteToWideChar(codepage, 0, value, -1, - (wchar_t *)wchBuf.data(), len) ) + (wchar_t *)(const wchar_t *)wchBuf, len) ) { wxLogLastError(_T("MultiByteToWideChar")); } // finally, stream it in the control const wchar_t *wpc = wchBuf; +#endif // wxUSE_UNICODE_MSLU EDITSTREAM eds; wxZeroMemory(eds); @@ -503,14 +576,18 @@ bool wxTextCtrl::StreamIn(const wxString& value, wxFontEncoding encoding) eds.pfnCallback = (EDITSTREAMCALLBACK)wxRichEditStreamIn; if ( !::SendMessage(GetHwnd(), EM_STREAMIN, - SF_TEXT | SF_UNICODE | SFF_SELECTION, + SF_TEXT | + SF_UNICODE | + (selectionOnly ? SFF_SELECTION : 0), (LPARAM)&eds) || eds.dwError ) { wxLogLastError(_T("EM_STREAMIN")); - - return FALSE; } +#if !wxUSE_WCHAR_T + free(wchBuf); +#endif // !wxUSE_WCHAR_T + return TRUE; } @@ -518,7 +595,16 @@ bool wxTextCtrl::StreamIn(const wxString& value, wxFontEncoding encoding) void wxTextCtrl::WriteText(const wxString& value) { - wxString valueDos = wxTextFile::Translate(value, wxTextFileType_Dos); + DoWriteText(value); +} + +void wxTextCtrl::DoWriteText(const wxString& value, bool selectionOnly) +{ + wxString valueDos; + if ( m_windowStyle & wxTE_MULTILINE ) + valueDos = wxTextFile::Translate(value, wxTextFileType_Dos); + else + valueDos = value; #if wxUSE_RICHEDIT // there are several complications with the rich edit controls here @@ -530,9 +616,18 @@ void wxTextCtrl::WriteText(const wxString& value) { long start, end; GetSelection(&start, &end); - SetStyle(start, end, m_defaultStyle ); + SetStyle(start, end, m_defaultStyle); } +#if wxUSE_UNICODE_MSLU + // RichEdit doesn't have Unicode version of EM_REPLACESEL on Win9x, + // but EM_STREAMIN works + if ( wxGetOsVersion() == wxWIN95 && GetRichVersion() > 1 ) + { + done = StreamIn(valueDos, wxFONTENCODING_SYSTEM, selectionOnly); + } +#endif // wxUSE_UNICODE_MSLU + #if !wxUSE_UNICODE // next check if the text we're inserting must be shown in a non // default charset -- this only works for RichEdit > 1.0 @@ -547,7 +642,7 @@ void wxTextCtrl::WriteText(const wxString& value) wxFontEncoding encoding = font.GetEncoding(); if ( encoding != wxFONTENCODING_SYSTEM ) { - done = StreamIn(valueDos, encoding); + done = StreamIn(valueDos, encoding, selectionOnly); } } } @@ -557,6 +652,11 @@ void wxTextCtrl::WriteText(const wxString& value) if ( !done ) #endif // wxUSE_RICHEDIT { + if ( !selectionOnly ) + { + SetSelection(-1, -1); + } + ::SendMessage(GetHwnd(), EM_REPLACESEL, 0, (LPARAM)valueDos.c_str()); } @@ -583,8 +683,7 @@ void wxTextCtrl::Copy() { if (CanCopy()) { - HWND hWnd = GetHwnd(); - SendMessage(hWnd, WM_COPY, 0, 0L); + ::SendMessage(GetHwnd(), WM_COPY, 0, 0L); } } @@ -592,8 +691,7 @@ void wxTextCtrl::Cut() { if (CanCut()) { - HWND hWnd = GetHwnd(); - SendMessage(hWnd, WM_CUT, 0, 0L); + ::SendMessage(GetHwnd(), WM_CUT, 0, 0L); } } @@ -601,8 +699,7 @@ void wxTextCtrl::Paste() { if (CanPaste()) { - HWND hWnd = GetHwnd(); - SendMessage(hWnd, WM_PASTE, 0, 0L); + ::SendMessage(GetHwnd(), WM_PASTE, 0, 0L); } } @@ -610,16 +707,13 @@ bool wxTextCtrl::CanCopy() const { // Can copy if there's a selection long from, to; - GetSelection(& from, & to); - return (from != to) ; + GetSelection(&from, &to); + return from != to; } bool wxTextCtrl::CanCut() const { - // Can cut if there's a selection - long from, to; - GetSelection(& from, & to); - return (from != to) && (IsEditable()); + return CanCopy() && IsEditable(); } bool wxTextCtrl::CanPaste() const @@ -658,12 +752,25 @@ void wxTextCtrl::SetEditable(bool editable) void wxTextCtrl::SetInsertionPoint(long pos) { - SetSelection(pos, pos); + DoSetSelection(pos, pos); } void wxTextCtrl::SetInsertionPointEnd() { - long pos = GetLastPosition(); + 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 + { + pos = GetLastPosition(); + } + SetInsertionPoint(pos); } @@ -686,19 +793,12 @@ long wxTextCtrl::GetInsertionPoint() const long wxTextCtrl::GetLastPosition() const { - HWND hWnd = GetHwnd(); - - // Will always return a number > 0 (according to docs) - int noLines = (int)SendMessage(hWnd, EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0L); - - // This gets the char index for the _beginning_ of the last line - int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)(noLines-1), (LPARAM)0L); + int numLines = GetNumberOfLines(); + long posStartLastLine = XYToPosition(0, numLines - 1); - // Get number of characters in the last line. We'll add this to the character - // index for the last line, 1st position. - int lineLength = (int)SendMessage(hWnd, EM_LINELENGTH, (WPARAM)charIndex, (LPARAM)0L); + long lenLastLine = GetLengthOfLineContainingPos(posStartLastLine); - return (long)(charIndex + lineLength); + return posStartLastLine + lenLastLine; } // If the return values from and to are the same, there is no @@ -725,39 +825,11 @@ void wxTextCtrl::GetSelection(long* from, long* to) const } } -wxString wxTextCtrl::GetStringSelection() const -{ - // the base class version works correctly for the rich text controls - // because there the lines are terminated with just '\r' which means that - // the string length is not changed in the result of the translations doen - // in GetValue() but for the normal ones when we replace "\r\n" with '\n' - // we break the indices -#if wxUSE_RICHEDIT - if ( IsRich() ) - return wxTextCtrlBase::GetStringSelection(); -#endif // wxUSE_RICHEDIT - - long from, to; - GetSelection(&from, &to); - - wxString str; - if ( from < to ) - { - str = wxGetWindowText(GetHWND()).Mid(from, to - from); - - // and now that we have the correct selection, convert it to the - // correct format - str = wxTextFile::Translate(str, wxTextFileType_Unix); - } - - return str; -} - bool wxTextCtrl::IsEditable() const { long style = ::GetWindowLong(GetHwnd(), GWL_STYLE); - return ((style & ES_READONLY) == 0); + return (style & ES_READONLY) == 0; } // ---------------------------------------------------------------------------- @@ -765,11 +837,6 @@ bool wxTextCtrl::IsEditable() const // ---------------------------------------------------------------------------- void wxTextCtrl::SetSelection(long from, long to) -{ - DoSetSelection(from, to); -} - -void wxTextCtrl::DoSetSelection(long from, long to, bool scrollCaret) { // if from and to are both -1, it means (in wxWindows) that all text should // be selected - translate into Windows convention @@ -779,6 +846,11 @@ void wxTextCtrl::DoSetSelection(long from, long to, bool scrollCaret) to = -1; } + DoSetSelection(from, to); +} + +void wxTextCtrl::DoSetSelection(long from, long to, bool scrollCaret) +{ HWND hWnd = GetHwnd(); #ifdef __WIN32__ @@ -798,41 +870,7 @@ void wxTextCtrl::DoSetSelection(long from, long to, bool scrollCaret) if ( scrollCaret ) { -#if wxUSE_RICHEDIT - // EM_SCROLLCARET doesn't work for me with the richedit controls - // unless it has focus although I don't see any mention of it in the - // docs - this is the only workaround I found. Of course it's not - // perfect as it adds the dummy focus set/kill events but it's still - // better than nothing - HWND hwndFocusOld; - if ( IsRich() ) - { - hwndFocusOld = ::GetFocus(); - if ( hwndFocusOld == GetHwnd() ) - { - // don't change focus - hwndFocusOld = 0; - } - - if ( hwndFocusOld ) - { - ::SetFocus(GetHwnd()); - } - } - else // not rich - { - hwndFocusOld = 0; - } -#endif // wxUSE_RICHEDIT - SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0); - -#if wxUSE_RICHEDIT - if ( hwndFocusOld ) - { - ::SetFocus(hwndFocusOld); - } -#endif // wxUSE_RICHEDIT } #else // Win16 // WPARAM is 0: selection is scrolled into view @@ -878,7 +916,7 @@ bool wxTextCtrl::LoadFile(const wxString& file) bool wxTextCtrl::IsModified() const { - return (SendMessage(GetHwnd(), EM_GETMODIFY, 0, 0) != 0); + return SendMessage(GetHwnd(), EM_GETMODIFY, 0, 0) != 0; } // Makes 'unmodified' @@ -894,11 +932,10 @@ int wxTextCtrl::GetNumberOfLines() const long wxTextCtrl::XYToPosition(long x, long y) const { - HWND hWnd = GetHwnd(); - // This gets the char index for the _beginning_ of this line - int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)y, (LPARAM)0); - return (long)(x + charIndex); + long charIndex = SendMessage(GetHwnd(), EM_LINEINDEX, (WPARAM)y, (LPARAM)0); + + return charIndex + x; } bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const @@ -906,15 +943,17 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const HWND hWnd = GetHwnd(); // This gets the line number containing the character - int lineNo; + long lineNo; #if wxUSE_RICHEDIT if ( IsRich() ) { - lineNo = (int)SendMessage(hWnd, EM_EXLINEFROMCHAR, 0, (LPARAM)pos); + lineNo = SendMessage(hWnd, EM_EXLINEFROMCHAR, 0, (LPARAM)pos); } else #endif // wxUSE_RICHEDIT - lineNo = (int)SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, 0); + { + lineNo = SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, 0); + } if ( lineNo == -1 ) { @@ -923,7 +962,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const } // This gets the char index for the _beginning_ of this line - int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)lineNo, (LPARAM)0); + long charIndex = SendMessage(hWnd, EM_LINEINDEX, (WPARAM)lineNo, (LPARAM)0); if ( charIndex == -1 ) { return FALSE; @@ -931,9 +970,9 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const // The X position must therefore be the different between pos and charIndex if ( x ) - *x = (long)(pos - charIndex); + *x = pos - charIndex; if ( y ) - *y = (long)lineNo; + *y = lineNo; return TRUE; } @@ -963,11 +1002,16 @@ void wxTextCtrl::ShowPosition(long pos) (void)SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)linesToScroll); } +long wxTextCtrl::GetLengthOfLineContainingPos(long pos) const +{ + return ::SendMessage(GetHwnd(), EM_LINELENGTH, (WPARAM)pos, 0); +} + int wxTextCtrl::GetLineLength(long lineNo) const { - long charIndex = XYToPosition(0, lineNo); - int len = (int)SendMessage(GetHwnd(), EM_LINELENGTH, charIndex, 0); - return len; + long pos = XYToPosition(0, lineNo); + + return GetLengthOfLineContainingPos(pos); } wxString wxTextCtrl::GetLineText(long lineNo) const @@ -1018,12 +1062,12 @@ void wxTextCtrl::Redo() bool wxTextCtrl::CanUndo() const { - return (::SendMessage(GetHwnd(), EM_CANUNDO, 0, 0) != 0); + return ::SendMessage(GetHwnd(), EM_CANUNDO, 0, 0) != 0; } bool wxTextCtrl::CanRedo() const { - return (::SendMessage(GetHwnd(), EM_CANUNDO, 0, 0) != 0); + return ::SendMessage(GetHwnd(), EM_CANUNDO, 0, 0) != 0; } // ---------------------------------------------------------------------------- @@ -1207,7 +1251,7 @@ WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSE wxColour colBack = GetBackgroundColour(); if (!IsEnabled() && (GetWindowStyle() & wxTE_MULTILINE) == 0) - colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE); + colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); ::SetBkColor(hdc, wxColourToRGB(colBack)); ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); @@ -1226,15 +1270,13 @@ void wxTextCtrl::OnEraseBackground(wxEraseEvent& event) #if wxUSE_CTL3D if (m_useCtl3D) - col = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW); + col = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); #endif RECT rect; ::GetClientRect(GetHwnd(), &rect); - COLORREF ref = PALETTERGB(col.Red(), - col.Green(), - col.Blue()); + COLORREF ref = wxColourToRGB(col); HBRUSH hBrush = ::CreateSolidBrush(ref); if ( !hBrush ) wxLogLastError(wxT("CreateSolidBrush")); @@ -1450,11 +1492,6 @@ bool wxTextCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // colour setting for the rich edit controls // ---------------------------------------------------------------------------- -// Watcom C++ doesn't define this -#ifndef SCF_ALL -#define SCF_ALL 0x0004 -#endif - bool wxTextCtrl::SetBackgroundColour(const wxColour& colour) { if ( !wxTextCtrlBase::SetBackgroundColour(colour) ) @@ -1507,10 +1544,9 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) return FALSE; } - // the rich text control doesn't handle setting background colour, so don't - // even try if it's the only thing we want to change - if ( wxRichEditModule::GetLoadedVersion() < 2 && - !style.HasFont() && !style.HasTextColour() ) + // 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() ) { // nothing to do: return TRUE if there was really nothing to do and // FALSE if we failed to set bg colour @@ -1544,8 +1580,23 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) #else CHARFORMAT cf; #endif + wxZeroMemory(cf); - cf.cbSize = sizeof(cf); + + // we can't use CHARFORMAT2 with RichEdit 1.0, so pretend it is a simple + // CHARFORMAT in that case +#if wxUSE_RICHEDIT2 + if ( m_verRichEdit == 1 ) + { + // this is the only thing the control is going to grok + cf.cbSize = sizeof(CHARFORMAT); + } + else +#endif + { + // CHARFORMAT or CHARFORMAT2 + cf.cbSize = sizeof(cf); + } if ( style.HasFont() ) { @@ -1594,7 +1645,7 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style) } #if wxUSE_RICHEDIT2 - if ( wxRichEditModule::GetLoadedVersion() > 1 && style.HasBackgroundColour() ) + if ( m_verRichEdit != 1 && style.HasBackgroundColour() ) { cf.dwMask |= CFM_BACKCOLOR; cf.crBackColor = wxColourToRGB(style.GetBackgroundColour()); @@ -1630,48 +1681,48 @@ bool wxRichEditModule::OnInit() void wxRichEditModule::OnExit() { - if ( ms_hRichEdit ) + for ( int i = 0; i < WXSIZEOF(ms_hRichEdit); i++ ) { - FreeLibrary(ms_hRichEdit); + if ( ms_hRichEdit[i] ) + { + ::FreeLibrary(ms_hRichEdit[i]); + } } } /* static */ bool wxRichEditModule::Load(int version) { - wxCHECK_MSG( version >= 1 && version <= 3, FALSE, + // 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") ); - if ( version <= ms_verRichEdit ) + // make it the index in the array + version--; + + if ( ms_hRichEdit[version] == (HINSTANCE)-1 ) { - // we've already got this or better - return TRUE; + // we had already tried to load it and failed + return FALSE; } - if ( ms_hRichEdit ) + if ( ms_hRichEdit[version] ) { - ::FreeLibrary(ms_hRichEdit); + // we've already got this one + return TRUE; } - // always try load riched20.dll first - like this we won't have to reload - // it later if we're first asked for RE 1 and then for RE 2 or 3 - wxString dllname = _T("riched20.dll"); - ms_hRichEdit = ::LoadLibrary(dllname); - ms_verRichEdit = 2; // no way to tell if it's 2 or 3, assume 2 + wxString dllname = version ? _T("riched20") : _T("riched32"); + dllname += _T(".dll"); - if ( !ms_hRichEdit && (version == 1) ) - { - // fall back to RE 1 - dllname = _T("riched32.dll"); - ms_hRichEdit = ::LoadLibrary(dllname); - ms_verRichEdit = 1; - } + ms_hRichEdit[version] = ::LoadLibrary(dllname); - if ( !ms_hRichEdit ) + if ( !ms_hRichEdit[version] ) { wxLogSysError(_("Could not load Rich Edit DLL '%s'"), dllname.c_str()); - ms_verRichEdit = -1; + ms_hRichEdit[version] = (HINSTANCE)-1; return FALSE; }