Copy solely the text string when TextEdit is active (DnD).

[tobiolo]

Same as 7f68776 but for Drag and Drop operation.

[aardappel]

That seems very similar code then.. should that be pulled into a function?

[tobiolo]

That seems very similar code then.. should that be pulled into a function?

This is a fantastic idea. I have merged the code for clipboard and drag and drop in into one main control flow.
What do you think?

[aardappel]

That required so many conditionals, that is definitely worse :)

What I meant is that I saw this code being identical in 2 places:

                        sys->clipboardcopy = s;
                        wxString html = selected.g->ConvertToText(selected, 0, A_EXPHTMLT, this);
                        auto *htmlobj = 
                        #ifdef __WXGTK__
                            new wxCustomDataObject(wxDF_HTML);
                        htmlobj->SetData(html.Len(), html);
                        #else
                            new wxHTMLDataObject(html);
                        #endif

So that could possibly be in a function, and maybe other parts of the code too.

[tobiolo]

That required so many conditionals, that is definitely worse :)

What I meant is that I saw this code being identical in 2 places:

                        sys->clipboardcopy = s;
                        wxString html = selected.g->ConvertToText(selected, 0, A_EXPHTMLT, this);
                        auto *htmlobj = 
                        #ifdef __WXGTK__
                            new wxCustomDataObject(wxDF_HTML);
                        htmlobj->SetData(html.Len(), html);
                        #else
                            new wxHTMLDataObject(html);
                        #endif

So that could possibly be in a function, and maybe other parts of the code too.

@aardappel
I agree. What about this iteration then? :-)

[aardappel]

I am not sure what you're asking.

[tobiolo]

I am not sure what you're asking.

Ok. I updated the PR (see commit). Is it ok now?

[aardappel]

why did you split it up by duplicating the code? the old code was better

[tobiolo]

The return types differ between WXGTK and other platforms.

[tobiolo]

Ok I changed that. But I need to set the return type and differentiate between WXGTK and others as also within the function body, there is a second differentiation then.

[tobiolo]

@aardappel
Is it ok now?

[aardappel]

just use a -> auto return type

[tobiolo]

And put the helper function above the caller did the "trick"!
Thanks for your feedback! :-)

[aardappel]

auto *htmlobj = outside the ifdef like the original.. and indent

[tobiolo]

Thanks for your reply. I also left the asterik now out because it is also deduced that it is a pointer type.

[tobiolo]

@aardappel
Does the revision fulfill your requirements?

[aardappel]

Much nicer, thanks!

[tobiolo]

Much nicer, thanks!

Thank you for your review making it much better!