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.

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

Jump to bottom

InputConfigDiag: Clean up dialog title translation handling #1628

Merged
merged 1 commit into from Dec 2, 2014
Merged

InputConfigDiag: Clean up dialog title translation handling #1628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/Core/DolphinWX/ControllerConfigDiag.cpp
View file
Open in desktop
Expand Up @@ -362,7 +362,7 @@ void ControllerConfigDiag::ConfigEmulatedWiimote(wxCommandEvent& ev)
Wiimote::Initialize(reinterpret_cast<void*>(GetHandle()));
#endif
}
InputConfigDialog m_ConfigFrame(this, *wiimote_plugin, _trans("Dolphin Emulated Wiimote Configuration"), m_wiimote_index_from_conf_bt_id[ev.GetId()]);
InputConfigDialog m_ConfigFrame(this, *wiimote_plugin, _("Dolphin Emulated Wiimote Configuration"), m_wiimote_index_from_conf_bt_id[ev.GetId()]);
m_ConfigFrame.ShowModal();
m_ConfigFrame.Destroy();
if (!was_init) // if game isn't running
Expand Down Expand Up @@ -486,7 +486,7 @@ void ControllerConfigDiag::OnGameCubeConfigButton(wxCommandEvent& event)
#endif
}

InputConfigDialog m_ConfigFrame(this, *pad_plugin, _trans("Dolphin GCPad Configuration"), port_num);
InputConfigDialog m_ConfigFrame(this, *pad_plugin, _("Dolphin GCPad Configuration"), port_num);
m_ConfigFrame.ShowModal();
m_ConfigFrame.Destroy();

Expand Down
4 changes: 2 additions & 2 deletions Source/Core/DolphinWX/InputConfigDiag.cpp
View file
Open in desktop
Expand Up @@ -1050,8 +1050,8 @@ GamepadPage::GamepadPage(wxWindow* parent, InputConfig& config, const unsigned i
};


InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputConfig& config, const std::string& name, const int tab_num)
: wxDialog(parent, wxID_ANY, wxGetTranslation(StrToWxStr(name)), wxPoint(128,-1))
InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputConfig& config, const wxString& name, const int tab_num)
: wxDialog(parent, wxID_ANY, name, wxPoint(128,-1))
, m_config(config)
{
m_pad_notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT);
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinWX/InputConfigDiag.h
View file
Open in desktop
Expand Up @@ -223,7 +223,7 @@ class GamepadPage : public wxPanel
class InputConfigDialog : public wxDialog
{
public:
InputConfigDialog(wxWindow* const parent, InputConfig& config, const std::string& name, const int tab_num = 0);
InputConfigDialog(wxWindow* const parent, InputConfig& config, const wxString& name, const int tab_num = 0);
//~InputConfigDialog();

bool Destroy() override;
Expand Down