Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

readded clipboard support to richedit sample and fixed a fatal bug in

Browse Source 
wxCustomDataObject (uninitialized m_data) which this allowed to discover


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-11-03 01:13:04 +00:00
parent 51edda6af0
commit 4e16881a08
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
samples/richedit/wxlwindow.cpp
View File

@@ -1080,21 +1080,19 @@ wxLayoutWindow::Paste(bool primary)
// Read some text
if (wxTheClipboard->Open())
{
#if __WXGTK__
if(primary)
wxTheClipboard->UsePrimarySelection();
#endif
#if wxUSE_PRIVATE_CLIPBOARD_FORMAT
wxLayoutDataObject wxldo;
if (wxTheClipboard->IsSupported( wxldo.GetFormat() ))
{
wxTheClipboard->GetData(&wxldo);
{
}
//FIXME: missing functionality m_llist->Insert(wxldo.GetList());
wxTheClipboard->GetData(wxldo);
// now we can access the data we had put into wxLayoutDataObject in
// wxLayoutList::GetSelection by calling its GetLayoutData() - the
// trouble is that I don't know what to do with it! (VZ)
}
else
#endif
{
wxTextDataObject data;
if (wxTheClipboard->IsSupported( data.GetFormat() ))
@@ -1120,8 +1118,8 @@ wxLayoutWindow::Copy(bool invalidate)
m_llist->EndSelection();
}
wxLayoutDataObject wldo;
wxLayoutList *llist = m_llist->GetSelection(&wldo, invalidate);
wxLayoutDataObject *wldo = new wxLayoutDataObject;
wxLayoutList *llist = m_llist->GetSelection(wldo, invalidate);
if(! llist)
return FALSE;
// Export selection as text:
@@ -1149,11 +1147,12 @@ wxLayoutWindow::Copy(bool invalidate)
if (wxTheClipboard->Open())
{
wxTextDataObject *data = new wxTextDataObject( text );
bool rc = wxTheClipboard->SetData( data );
#if wxUSE_PRIVATE_CLIPBOARD_FORMAT
rc |= wxTheClipboard->AddData( &wldo );
#endif
wxDataObjectComposite *dobj = new wxDataObjectComposite;
dobj->Add(new wxTextDataObject(text));
dobj->Add(wldo);
bool rc = wxTheClipboard->SetData(dobj);
wxTheClipboard->Close();
return rc;
}