Skip to content

Commit

Permalink
Comment is no longer valid (#629)
Browse files Browse the repository at this point in the history
* Comment is no longer valid

Issue solved with wxWidgets/wxWidgets#24505

But it makes sense to keep the changes and not to pack the data objects
into a composite object only to unpack it later.

* Increment minimum supported version
  • Loading branch information
tobiolo authored Sep 15, 2024
1 parent d7d114e commit 3fd66cb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
10 changes: 3 additions & 7 deletions src/document.h
Original file line number Diff line number Diff line change
Expand Up @@ -1566,17 +1566,13 @@ struct Document {
case wxID_PASTE:
if (!(c = selected.ThinExpand(this))) return OneCell();
if (wxTheClipboard->Open()) {
// wxDataObjectComposite does not work properly under Wayland for text atoms
// and also needs to be allocated to the heap because of the behavior of its
// destructor.
//
// Instead of aggregating the possible targets to one wxDataObjectComposite on
// the heap, just create one wxDataObjectSimple subclass instance for each type
// Instead of aggregating the possible targets to one wxDataObjectComposite
// just create one wxDataObjectSimple subclass instance for each type
// TreeSheets can handle on the stack and try to paste the clipboard content
// into it.
//
// For drag and drop operations, wxDataObjectComposite is still mandatory, so
// keep one instance for it separately at the System instance.
// keep one instance for it separately at each Document instance.
wxTextDataObject pdataobjt;
wxBitmapDataObject pdataobji;
wxFileDataObject pdataobjf;
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "stdafx.h"
#include "lobster/string_tools.h"

static_assert(wxCHECK_VERSION(3, 2, 3), "wxWidgets < 3.2.3 is not supported.");
static_assert(wxCHECK_VERSION(3, 2, 6), "wxWidgets < 3.2.6 is not supported.");

#ifndef __WXMSW__
#define SIMPLERENDER
Expand Down

0 comments on commit 3fd66cb

Please sign in to comment.