ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix pad configuration dialog on linux 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5676 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-06-13 14:49:49 +00:00
parent 6d5da6b9be
commit 9123ae3230
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Common/Src/FileUtil.cpp
View File

@ -648,9 +648,9 @@ const char *GetUserPath(int DirIDX)
// Keep the directory setup the way it was on windows // Keep the directory setup the way it was on windows
snprintf(UserDir, sizeof(UserDir), ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP); snprintf(UserDir, sizeof(UserDir), ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP);
#elif defined (__linux__) #elif defined (__linux__)
if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) // if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR))
snprintf(UserDir, sizeof(UserDir), ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP); // snprintf(UserDir, sizeof(UserDir), ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP);
else // else
snprintf(UserDir, sizeof(UserDir), "%s" DIR_SEP DOLPHIN_DATA_DIR DIR_SEP, getenv("HOME")); snprintf(UserDir, sizeof(UserDir), "%s" DIR_SEP DOLPHIN_DATA_DIR DIR_SEP, getenv("HOME"));
#else #else
snprintf(UserDir, sizeof(UserDir), "%s" DIR_SEP DOLPHIN_DATA_DIR DIR_SEP, getenv("HOME")); snprintf(UserDir, sizeof(UserDir), "%s" DIR_SEP DOLPHIN_DATA_DIR DIR_SEP, getenv("HOME"));

4
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -950,7 +950,11 @@ void CFrame::OnPluginPAD(wxCommandEvent& WXUNUSED (event))
was_init = true; was_init = true;
else else
{ {
#if defined(HAVE_X11) && HAVE_X11
GCPad_Init(X11Utils::XDisplayFromHandle(GetHandle()));
#else
GCPad_Init(GetHandle()); GCPad_Init(GetHandle());
#endif
} }
InputConfigDialog* m_ConfigFrame = new InputConfigDialog(this, *pad_plugin, "GCPadNew", was_init ); InputConfigDialog* m_ConfigFrame = new InputConfigDialog(this, *pad_plugin, "GCPadNew", was_init );
m_ConfigFrame->ShowModal(); m_ConfigFrame->ShowModal();

3
Source/Core/InputUICommon/Src/ConfigDiag.cpp
View File

@ -951,7 +951,8 @@ InputConfigDialog::InputConfigDialog( wxWindow* const parent, InputPlugin& plugi
} }
InputConfigDialog::~InputConfigDialog() bool InputConfigDialog::Destroy()
{ {
m_update_timer->Stop(); m_update_timer->Stop();
return true;
} }

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

@ -224,7 +224,7 @@ class InputConfigDialog : public wxDialog
public: public:
InputConfigDialog( wxWindow* const parent, InputPlugin& plugin, const std::string& name, const bool _is_game_running ); InputConfigDialog( wxWindow* const parent, InputPlugin& plugin, const std::string& name, const bool _is_game_running );
~InputConfigDialog(); bool Destroy();
void ClickSave( wxCommandEvent& event ); void ClickSave( wxCommandEvent& event );