Linux: fix tray icon menu build with INDICATOR=1#1823
Open
ElCruncharino wants to merge 1 commit into
Open
Conversation
A few menu item labels were passed as wxString instead of .mb_str(), which doesn't compile against wxWidgets 3.2. One label in the same function already did it right, the rest didn't.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
Building with
INDICATOR=1fails on wxWidgets 3.2:Four of the five tray menu labels in
ShowTaskBarIcon()pass awxStringstraight togtk_menu_item_new_with_label(), which wants aconst gchar*. The fifth (SHOW_TC/HIDE_TC) already calls.mb_str()and compiles fine.INDICATORis opt-in and off by default, so perhaps this has gone unnoticed?Change
Add the missing
.mb_str()to the other four labels. No behavior change, just makes it compile.Testing
Built with
make INDICATOR=1 WITHFUSE3=1against wxWidgets 3.2.8 and libayatana-appindicator3. Confirmed the resulting binary links against libayatana-appindicator3 and shows a working tray icon.