piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

(cleanup) Delete an awful global variable (g_plugin in ConfigDiag). Rename the Plugin class in InputConfig to InputPlugin, which is better but not ideal.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5663 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2010-06-12 18:45:39 +00:00
parent 393aa36fc2
commit caab5f62ad
7 changed files with 89 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/InputUICommon/Src/ConfigDiag.h
View File

@ -121,7 +121,7 @@ private:
class ControlDialog : public wxDialog
{
public:
ControlDialog( wxWindow* const parent, ControllerInterface::ControlReference* const ref, const std::vector<ControllerInterface::Device*>& devs );
ControlDialog( wxWindow* const parent, InputPlugin& plugin, ControllerInterface::ControlReference* const ref, const std::vector<ControllerInterface::Device*>& devs );
void SelectControl( wxCommandEvent& event );
void DetectControl( wxCommandEvent& event );
@ -130,6 +130,7 @@ public:
void SetDevice( wxCommandEvent& event );
ControllerInterface::ControlReference* const control_reference;
InputPlugin& m_plugin;
wxComboBox* device_cbox;
ControlChooser* control_chooser;
};
@ -172,14 +173,14 @@ public:
};
class ConfigDialog;
class InputConfigDialog;
class GamepadPage : public wxNotebookPage
{
friend class ConfigDialog;
friend class InputConfigDialog;
public:
GamepadPage( wxWindow* parent, const unsigned int pad_num, ConfigDialog* const config_dialog );
GamepadPage( wxWindow* parent, InputPlugin& plugin, const unsigned int pad_num, InputConfigDialog* const config_dialog );
void UpdateGUI();
@ -214,15 +215,16 @@ protected:
private:
ControlDialog* m_control_dialog;
ConfigDialog* const m_config_dialog;
InputConfigDialog* const m_config_dialog;
InputPlugin &m_plugin;
};
class ConfigDialog : public wxDialog
class InputConfigDialog : public wxDialog
{
public:
ConfigDialog( wxWindow* const parent, Plugin& plugin, const std::string& name, const bool _is_game_running );
~ConfigDialog();
InputConfigDialog( wxWindow* const parent, InputPlugin& plugin, const std::string& name, const bool _is_game_running );
~InputConfigDialog();
void ClickSave( wxCommandEvent& event );
@ -238,7 +240,7 @@ private:
wxNotebook* m_pad_notebook;
std::vector<GamepadPage*> m_padpages;
Plugin& m_plugin;
InputPlugin& m_plugin;
wxTimer* m_update_timer;
};