// 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);
+ wxRICHTEXT_DEFAULT_DROPTARGET = reinterpret_cast<wxDropTarget *>(1);
#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
: 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;
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)
EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
#if wxUSE_RICHEDIT
}
#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
{
if ( wxRichEditModule::Load(wxRichEditModule::Version_1) )
{
- windowClass = _T("RICHEDIT");
+ windowClass = wxT("RICHEDIT");
}
else // failed to load any richedit control DLL
{
valueWin = value;
}
+ // 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;
+ m_updatesCount = -1;
+
#if wxUSE_RICHEDIT
if (IsRich())
{
::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,
#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;
}
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();
}
+#if wxUSE_INTL
if ( encoding == wxFONTENCODING_SYSTEM )
{
encoding = wxLocale::GetSystemEncoding();
}
+#endif // wxUSE_INTL
if ( encoding == wxFONTENCODING_SYSTEM )
{
// style - convert it to something reasonable
for ( ; *p; p++ )
{
- if ( *p == _T('\r') )
- *p = _T('\n');
+ if ( *p == wxT('\r') )
+ *p = wxT('\n');
}
}
}
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 )
// 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 */);
// 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;
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.mb_str(), value.length());
+ conv.MB2WC(wpc, value.mb_str(), len + 1);
#endif // wxUSE_UNICODE_MSLU
// 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;
// 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;
}
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;
if ( eds.dwError )
{
- wxLogLastError(_T("EM_STREAMOUT"));
+ wxLogLastError(wxT("EM_STREAMOUT"));
}
else // streamed out ok
{
// 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);
}
}
-#if !wxUSE_WCHAR_T
- free(wchBuf);
-#endif // !wxUSE_WCHAR_T
-
return out;
}
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 )
// 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
}
#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;
else
#endif // wxUSE_RICHEDIT
{
- ::SendMessage(hWnd, EM_SETSEL, from, to);
+ wxTextEntry::DoSetSelection(from, to, flags);
}
if ( (flags & SetSel_Scroll) && !IsFrozen() )
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<short>(LOWORD(rc)),
+ static_cast<short>(HIWORD(rc)));
+ }
+
+ return wxDefaultPosition;
+}
+
+
// ----------------------------------------------------------------------------
//
// ----------------------------------------------------------------------------
{
// 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--;
}
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:
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
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;
+ }
+ }
+
+ // 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();
+}
+
WXLRESULT wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
WXLRESULT lRc = wxTextCtrlBase::MSWWindowProc(nMsg, wParam, lParam);
else // !editable
{
// NB: use "=", not "|=" as the base class version returns
- // the same flags is this state as usual (i.e.
+ // 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;
}
+ if (IsMultiLine())
+ // Clear the DLGC_HASSETSEL bit from the return value
+ lRc &= ~DLGC_HASSETSEL;
}
break;
- case WM_CUT:
- case WM_COPY:
- case WM_PASTE:
- if ( HandleClipboardEvent(nMsg) )
- lRc = 0;
- 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;
return false;
default:
- wxFAIL_MSG( _T("unexpected wxTextCtrl::m_updatesCount value") );
+ wxFAIL_MSG( wxT("unexpected wxTextCtrl::m_updatesCount value") );
// fall through
case -1:
{
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;
}
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;
}
}
//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) )
+ {
+ // 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;
+ }
return wxSize(wText, hText);
}
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)
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::OnContextMenu(wxContextMenuEvent& 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());
}
-}
-
-// ----------------------------------------------------------------------------
-// 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;
+ event.Skip();
}
// the rest of the file only deals with the rich edit controls
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;
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) );
+ wxStrlcpy(cf.szFaceName, lf.lfFaceName, WXSIZEOF(cf.szFaceName));
// also deal with underline/italic/bold attributes: note that we must
// always set CFM_ITALIC &c bits in dwMask, even if we don't set the
}
#endif // wxUSE_RICHEDIT2
- // do format the selection
- bool ok = ::SendMessage(GetHwnd(), EM_SETCHARFORMAT,
- SCF_SELECTION, (LPARAM)&cf) != 0;
- if ( !ok )
+ // Apply the style either to the selection or to the entire control.
+ WPARAM selMode;
+ if ( start != -1 || end != -1 )
+ {
+ DoSetSelection(start, end, SetSel_NoScroll);
+ selMode = SCF_SELECTION;
+ }
+ else
{
- wxLogDebug(_T("SendMessage(EM_SETCHARFORMAT, SCF_SELECTION) failed"));
+ selMode = SCF_ALL;
}
- // now do the paragraph formatting
+ if ( !::SendMessage(GetHwnd(), EM_SETCHARFORMAT, selMode, (LPARAM)&cf) )
+ {
+ wxLogLastError(wxT("SendMessage(EM_SETCHARFORMAT)"));
+ return false;
+ }
+
+ 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
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);
lf.lfWeight = FW_NORMAL;
wxFont font = wxCreateFontFromLogFont(& lf);
- if (font.Ok())
+ if (font.IsOk())
{
style.SetFont(font);
}
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,
// 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;
projects / wxWidgets.git / blobdiff