Compare commits

...

2 commits

Author SHA1 Message Date
oltolm
6c392d5a22
UI: Fix assertions (#1623)
Some checks failed
Generate translation template / generate-pot (push) Failing after 41s
Build check / build (push) Has been cancelled
2025-06-30 00:15:23 +02:00
Colin Kinloch
9fb3c76b76
UI: Include wx button header for wxWidgets 3.3 compatibility (#1621) 2025-06-29 19:36:22 +02:00
3 changed files with 5 additions and 9 deletions

View file

@ -182,14 +182,14 @@ void DownloadGraphicPacksWindow::UpdateThread()
if (checkGraphicPackDownloadedVersion(assetName, hasVersionFile))
{
// already up to date
wxMessageBox(_("No updates available."), _("Graphic packs"), wxOK | wxCENTRE, this->GetParent());
wxMessageBox(_("No updates available."), _("Graphic packs"), wxOK | wxCENTRE, this);
m_threadState = ThreadFinished;
return;
}
if (hasVersionFile)
{
// if a version file already exists (and graphic packs are installed) ask the user if he really wants to update
if (wxMessageBox(_("Updated graphic packs are available. Do you want to download and install them?"), _("Graphic packs"), wxYES_NO, this->GetParent()) != wxYES)
if (wxMessageBox(_("Updated graphic packs are available. Do you want to download and install them?"), _("Graphic packs"), wxYES_NO, this) != wxYES)
{
// cancel update
m_threadState = ThreadFinished;
@ -336,7 +336,7 @@ int DownloadGraphicPacksWindow::ShowModal()
{
if(CafeSystem::IsTitleRunning())
{
wxMessageBox(_("Graphic packs cannot be updated while a game is running."), _("Graphic packs"), 5, this->GetParent());
wxMessageBox(_("Graphic packs cannot be updated while a game is running."), _("Graphic packs"), 5, this);
return wxID_CANCEL;
}
m_thread = std::thread(&DownloadGraphicPacksWindow::UpdateThread, this);

View file

@ -5,6 +5,7 @@
#include <wx/statbox.h>
#include <wx/msgdlg.h>
#include <wx/radiobox.h>
#include <wx/button.h>
#include "config/ActiveSettings.h"
#include "gui/CemuApp.h"

View file

@ -174,12 +174,7 @@ void InputPanel::load_controller(const EmulatedControllerPtr& controller)
continue;
auto button_name = controller->get_mapping_name(mapping);
#if BOOST_OS_WINDOWS
text->SetLabelText(button_name);
#else
// SetLabelText doesn't seem to work here for some reason on wxGTK
text->ChangeValue(button_name);
#endif
text->ChangeValue(button_name);
}
}