Don't try to open clipboard if already open
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
c59f6793fb
commit
d21423356e
@ -3824,7 +3824,7 @@ bool wxRichTextBuffer::CopyToClipboard(const wxRichTextRange& range)
|
||||
{
|
||||
bool success = false;
|
||||
wxString text = GetTextForRange(range);
|
||||
if (wxTheClipboard->Open())
|
||||
if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open())
|
||||
{
|
||||
success = wxTheClipboard->SetData(new wxTextDataObject(text));
|
||||
wxTheClipboard->Close();
|
||||
@ -3883,7 +3883,7 @@ bool wxRichTextBuffer::PasteFromClipboard(long position)
|
||||
bool wxRichTextBuffer::CanPasteFromClipboard() const
|
||||
{
|
||||
bool canPaste = false;
|
||||
if (wxTheClipboard->Open())
|
||||
if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open())
|
||||
{
|
||||
if (wxTheClipboard->IsSupported(wxDF_TEXT) || wxTheClipboard->IsSupported(wxDF_BITMAP))
|
||||
{
|
||||
|
@ -218,6 +218,9 @@ void wxRichTextCtrl::Clear()
|
||||
/// Painting
|
||||
void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
|
||||
{
|
||||
if (GetCaret())
|
||||
GetCaret()->Hide();
|
||||
|
||||
{
|
||||
wxBufferedPaintDC dc(this, m_bufferBitmap);
|
||||
//wxLogDebug(wxT("OnPaint"));
|
||||
@ -245,6 +248,10 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
|
||||
|
||||
GetBuffer().Draw(dc, GetBuffer().GetRange(), GetSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);
|
||||
}
|
||||
|
||||
if (GetCaret())
|
||||
GetCaret()->Show();
|
||||
|
||||
PositionCaret();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user