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

Replace even more GTK 1 #236

Merged
merged 10 commits into from
Nov 14, 2024
Merged

Replace even more GTK 1 #236

merged 10 commits into from
Nov 14, 2024

Conversation

zturtleman
Copy link
Contributor

@zturtleman zturtleman commented Nov 10, 2024

I'm continuing toward GTK 2 without deprecated features / GTK3. It's not as bad as I remembered and made it out to be in #234.

This PR is currently missing images in game lists and drop down menus as I haven't integrated my GdkPixbuf work from a year ago yet. [Now solved.]

Beyond that, still need to replace gtk_clist (179 code references), gtk_ctree (48 code references), and replace deprecated GTK2 image combining stuff with Cairo (gdk_gc_*/ gdk_draw_* 49 code references). [Image combining is solved.]

The button for the drop down menu can now be focused by tab.
GtkComboBoxText doesn't allow disabling focus on it.

"Add Master" dialog now updates the selected protocol button based on
the typed text rather than clicking the history as GtkComboBoxText
doesn't have a separate event.
Statistics Country game list doesn't have a separator any more and
"All Games" is not centered.
gtk_adjustment_new() returns GtkObject in GTK2 and GtkAdjustment in
GTK3.
@zturtleman
Copy link
Contributor Author

The image loading and combining now uses GdkPixbuf. I think it's GTK3 compatible now (without Cairo after all). The game icons are restored in the game list and drop down menus now that they are in GdkPixbuf form.

I'm not aware of any new issues. Though I may modify the commits as I deal with gtk_clist and gtk_ctree so the GTK3 build will link.

@illwieckz
Copy link
Member

I don't see any regression. I can merge this now and you can submit gtk_clist/gtk_ctree changes later I guess!

@zturtleman zturtleman marked this pull request as ready for review November 14, 2024 03:31
@zturtleman
Copy link
Contributor Author

Yeah, that's fine.

@illwieckz illwieckz merged commit 6bf69d7 into XQF:master Nov 14, 2024
2 checks passed
@zturtleman zturtleman deleted the gtk2_update branch November 14, 2024 23:20
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