From 92ad1ff7267d3bfbc0ccb225a032412e153e513b Mon Sep 17 00:00:00 2001 From: Tobias Predel Date: Fri, 13 Oct 2023 06:20:00 +0200 Subject: [PATCH] Workaround is no longer needed (#540) --- src/document.h | 8 +------- src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/document.h b/src/document.h index 2b4c1870..5118e4b4 100755 --- a/src/document.h +++ b/src/document.h @@ -413,13 +413,7 @@ struct Document { auto CopyEntireCells(wxString &s, int k) { sys->clipboardcopy = s; wxString html = selected.g->ConvertToText(selected, 0, k == A_COPYWI ? A_EXPHTMLTI : A_EXPHTMLT, this, false); - auto htmlobj = - #if defined(__WXGTK__) && !wxCHECK_VERSION(3, 3, 0) - new wxCustomDataObject(wxDF_HTML); - htmlobj->SetData(html.Len(), html); - #else - new wxHTMLDataObject(html); - #endif + auto htmlobj = new wxHTMLDataObject(html); return htmlobj; } diff --git a/src/main.cpp b/src/main.cpp index cd015a55..e56ec059 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -static_assert(wxCHECK_VERSION(3, 2, 2), "wxWidgets < 3.2.2 is not supported."); +static_assert(wxCHECK_VERSION(3, 2, 3), "wxWidgets < 3.2.3 is not supported."); #ifndef __WXMSW__ #define SIMPLERENDER