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

Implement missing functions for 2.6.x #236

Closed
wants to merge 2 commits into from

Conversation

Marioalexsan
Copy link
Member

Figured I might as well make an attempt at this. Not sure if sfMalloc is needed but I added it in for completeness.

Fixes #235.

include/SFML/System/Alloc.h Outdated Show resolved Hide resolved
Copy link
Member

@ChrisThrasher ChrisThrasher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Barring an ultra-critical whitespace error I think this is good. Eager to see you fold this into SFML.Net to confirm it's all working!

src/SFML/Window/Mouse.cpp Show resolved Hide resolved
@ChrisThrasher
Copy link
Member

ChrisThrasher commented Mar 10, 2024

It appears that in trying to fix this whitespace error myself then squashing the new commit that was created, I accidentally pushed these changes straight to 2.6.x. I didn't realize your PR was opened from your own repo's 2.6.x branch. I'm used to that not being the case and thus I can edit the PR's branch without affecting the target branch. Oh well. I was already going to merge it anyways so the outcome is all the same.

Thanks for your work!

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

Successfully merging this pull request may close these issues.

Some CSFML 2.6.x API Discrepancies
3 participants