Skip to content

Fix using wxLauncher with wxwidgets 3.2 #173

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.

Sign up for GitHub

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

Open
MageJohn wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix using wxLauncher with wxwidgets 3.2 #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3af9a21
Fix compile error with wxwidgets 3.2
MageJohn Dec 13, 2022
b8f23f1
Fix some assertion errors from calls to the logger
MageJohn Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/apis/ProfileManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ bool ProMan::Initialize(Flags flags) {
wxArrayString foundProfiles;
wxDir::GetAllFiles(GetProfileStorageFolder(), &foundProfiles, wxT_2("pro?????.ini"));

wxLogInfo(wxT_2(" Found %d profile(s)."), foundProfiles.Count());
wxLogInfo(wxT_2(" Found %u profile(s)."), static_cast<unsigned>(foundProfiles.Count()));
for( size_t i = 0; i < foundProfiles.Count(); i++) {
wxLogDebug(wxT_2(" Opening %s"), foundProfiles[i].c_str());
wxFFileInputStream instream(foundProfiles[i]);
Expand Down Expand Up @@ -1430,8 +1430,8 @@ void ProMan::TestConfigFunctions(wxConfigBase& src) {
wxLogDebug(_T("contents of dest config after clearing:"));
LogConfigContents(*dest);

wxLogDebug(_T("after clearing, dest has %d entries and %d groups"),
dest->GetNumberOfEntries(true), dest->GetNumberOfGroups(true));
wxLogDebug(_T("after clearing, dest has %u entries and %u groups"),
static_cast<unsigned>(dest->GetNumberOfEntries(true)), static_cast<unsigned>(dest->GetNumberOfGroups(true)));

wxLogDebug(_T("recopying src to dest"));

Expand Down
2 changes: 1 addition & 1 deletion code/controls/ModList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const wxString NO_MOD(_("(No mod)"));
// to keep the presets box from overlapping with flag list
const size_t MAX_PRESET_NAME_LENGTH = 32;

class ModInfoDialog: wxDialog {
class ModInfoDialog: public wxDialog {
public:
ModInfoDialog(ModItem* item, wxWindow* parent);
void OnLinkClicked(wxHtmlLinkEvent &event);
Expand Down
4 changes: 2 additions & 2 deletions code/datastructures/FSOExecutable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ wxArrayString FSOExecutable::GetBinariesFromRootFolder(

if (!quiet) {
wxString execType = startPattern.Lower().Find(_T("fred")) == wxNOT_FOUND ? _T("FS2") : _T("FRED2");
wxLogInfo(_T(" Found %d %s Open executables in '%s'"),
files.GetCount(), execType.c_str(), path.GetPath().c_str());
wxLogInfo(_T(" Found %u %s Open executables in '%s'"),
static_cast<unsigned>(files.GetCount()), execType.c_str(), path.GetPath().c_str());

for (size_t i = 0, n = files.GetCount(); i < n; ++i) {
wxLogDebug(_T("Found executable: %s"), files.Item(i).c_str());
Expand Down