Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use old layout code for non-Gtk3 #15

Merged
merged 1 commit into from
Jul 5, 2021

Conversation

VisualMelon
Copy link
Contributor

@VisualMelon VisualMelon commented Jul 5, 2021

Fixes issues introduced with #12 not compiling with GTK#. Uses the old layout code for non-Gtk3.

Tested GTK#3 bits with the NET Core branch; hoping AppVeyor will be happy; will try to test on my old Win7 box.

Changes:

  • introduce GTKSHARP3 macro for the GtkSharp3 project
  • use new Layout code (from memory leak fixed(?) #12) in GtkSharp3 project, otherwise use the old code

@VisualMelon
Copy link
Contributor Author

OK, old Win7 box still works, and the GTK# provision doesn't seem to be leaking.

@VisualMelon VisualMelon merged commit 07aa7b4 into oxyplot:master Jul 5, 2021
@d-buchmann
Copy link
Contributor

Sorry for introducing the hassle.
Honestly, I don't have any experience with CI and couldn't test with Gtk2.
I've already put some effort into building 2.12.45 from source, in vain however.

@VisualMelon
Copy link
Contributor Author

VisualMelon commented Jul 5, 2021

@d-buchmann no need to apologise; after seeing what https://github.com/oxyplot/oxyplot-gtksharp/blob/master/appveyor.yml does, I installed a (hopefully corresponding) GTK on an old box with Chocolatey.

Are you able to check that this PR works for you with GTK#3?

@d-buchmann
Copy link
Contributor

I'll try and check tomorrow. So long :)

@d-buchmann
Copy link
Contributor

Tested ExampleBrowserGtk3 on Win10 and Linux successfully (only the PlotController examples actually, but if think it will suffice).

@VisualMelon
Copy link
Contributor Author

@d-buchmann thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants