izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed GCPadNew GUI, clicking Set is no longer needed after choosing items from the list on Linux.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5370 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2010-04-14 23:50:33 +00:00
parent 803030de7b
commit 110fc18375
5 changed files with 154 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Plugins/InputPluginCommon/Src/ConfigDiag.cpp
+143 -139
View File
File diff suppressed because it is too large Load Diff
Source/Plugins/InputPluginCommon/Src/ConfigDiag.h
+8 -5
View File
@@ -71,6 +71,8 @@ public:
ControlChooser( wxWindow* const parent, ControllerInterface::ControlReference* const ref, wxWindow* const eventsink );
void UpdateGUI();
void UpdateListContents();
void UpdateListSelection();
ControllerInterface::ControlReference* control_reference;
@@ -97,7 +99,12 @@ class ControlDialog : public wxDialog
{
public:
ControlDialog( wxWindow* const parent, ControllerInterface::ControlReference* const ref, const std::vector<ControllerInterface::Device*>& devs );
void SelectControl( wxCommandEvent& event );
void DetectControl( wxCommandEvent& event );
void ClearControl( wxCommandEvent& event );
void SetControl( wxCommandEvent& event );
void SetDevice( wxCommandEvent& event );
ControllerInterface::ControlReference* const control_reference;
wxComboBox* device_cbox;
@@ -149,7 +156,7 @@ class GamepadPage : public wxNotebookPage
friend class ConfigDialog;
public:
GamepadPage( wxWindow* parent, Plugin& plugin, const unsigned int pad_num, ConfigDialog* const config_dialog );
GamepadPage( wxWindow* parent, const unsigned int pad_num, ConfigDialog* const config_dialog );
void UpdateGUI();
@@ -160,14 +167,11 @@ public:
void DeleteProfile( wxCommandEvent& event );
void ConfigControl( wxCommandEvent& event );
void ConfigDetectControl( wxCommandEvent& event );
void DetectControl( wxCommandEvent& event );
void ClearControl( wxCommandEvent& event );
void ConfigExtension( wxCommandEvent& event );
void SetDevice( wxCommandEvent& event );
void SetControl( wxCommandEvent& event );
void ClearAll( wxCommandEvent& event );
@@ -186,7 +190,6 @@ protected:
private:
ControlDialog* m_control_dialog;
Plugin& m_plugin;
ConfigDialog* const m_config_dialog;
};
Source/Plugins/Plugin_GCPadNew/Src/GCPadNew.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#endif
// plugin globals
Plugin g_plugin( "GCPadNew", "Pad", "GCPad" );
static Plugin g_plugin( "GCPadNew", "Pad", "GCPad" );
SPADInitialize *g_PADInitialize = NULL;
#ifdef _WIN32
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/EmuSubroutines.cpp
+1
View File
@@ -406,6 +406,7 @@ void Wiimote::SendReadDataReply(u16 _channelID, const void* _Base, unsigned int
{
reply->size = 0x0f;
reply->error = 0x08;
reply->address = Common::swap16(_Address);
memset(reply->data, 0, sizeof(reply->data));
m_wiimote_init->pWiimoteInput(m_index, _channelID, data, sizeof(data));
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteNew.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#endif
// plugin globals
Plugin g_plugin( "WiimoteNew", "Wiimote", "Wiimote" );
static Plugin g_plugin( "WiimoteNew", "Wiimote", "Wiimote" );
SWiimoteInitialize g_WiimoteInitialize;
#ifdef _WIN32