From 0db67cf51c85796a33b75139e7eb6f0225b7bd3d Mon Sep 17 00:00:00 2001 From: John Peterson Date: Sat, 24 Jan 2009 22:17:51 +0000 Subject: [PATCH] nJoy: Small change git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2004 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp | 7 ++----- Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp | 10 ++++------ Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h | 1 - 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp index 7295efc33d..fa06351219 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp @@ -37,7 +37,6 @@ #include "../nJoy.h" #include "Images/controller.xpm" -//extern CONTROLLER_INFO *joyinfo; extern bool emulator_running; //////////////////////// @@ -246,12 +245,10 @@ std::string ShowStatus(int VirtualController) void ConfigBox::Update() { // Show the current status - /**/ + /* m_pStatusBar->SetLabel(wxString::Format( "%s", ShowStatus(notebookpage).c_str() - )); - - Console::Print("3: %p\n", PadState[PadMapping[3].ID].joy); + ));*/ //LogMsg("Abc%s\n", ShowStatus(notebookpage).c_str()); diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp index 14a94812f3..b5630096a6 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp @@ -39,8 +39,6 @@ #include "../nJoy.h" #include "Images/controller.xpm" -//extern CONTROLLER_INFO *joyinfo; -//extern CONTROLLER_MAPPING PadMapping[4]; extern bool emulator_running; // D-Pad type @@ -116,7 +114,7 @@ ConfigBox::ConfigBox(wxWindow *parent, wxWindowID id, const wxString &title, // Define values notebookpage = 0; g_Pressed = 0; - Debugging = true; + Debugging = false; m_TCDebugging = NULL; ControlsCreated = false; @@ -927,15 +925,15 @@ void ConfigBox::CreateGUIControls() // -------------------------------------------------------------------- // Debugging // ----------------------------- - m_pStatusBar = new wxStaticText(this, IDT_DEBUGGING, wxT("Debugging"), wxPoint(135, 100), wxDefaultSize); + //m_pStatusBar = new wxStaticText(this, IDT_DEBUGGING, wxT("Debugging"), wxPoint(135, 100), wxDefaultSize); //m_pStatusBar2 = new wxStaticText(this, IDT_DEBUGGING2, wxT("Debugging2"), wxPoint(125, 200), wxDefaultSize); //m_pStatusBar->SetLabel(wxString::Format("Debugging text")); - /**/m_TCDebugging = new wxTextCtrl(this, IDT_DEBUGGING3, _T(""), wxDefaultPosition, wxSize(400, 400), + /*m_TCDebugging = new wxTextCtrl(this, IDT_DEBUGGING3, _T(""), wxDefaultPosition, wxSize(400, 400), wxTE_RICH | wxTE_MULTILINE | wxTE_DONTWRAP | wxNO_BORDER); wxBoxSizer * m_LogSizer = new wxBoxSizer(wxVERTICAL); m_LogSizer->Add(m_TCDebugging, 0, wxEXPAND | (wxALL), 0); - m_MainSizer->Add(m_LogSizer, 0, wxEXPAND | ( wxLEFT | wxRIGHT | wxBOTTOM), 5); + m_MainSizer->Add(m_LogSizer, 0, wxEXPAND | ( wxLEFT | wxRIGHT | wxBOTTOM), 5);*/ // -------------------------------------------------------------------- // Set window size diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h index 3d92fb74bd..b4835ff6a9 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h @@ -227,7 +227,6 @@ extern std::vector Keys; // ŻŻŻŻŻŻŻŻŻ #ifndef _CONTROLLER_STATE_H extern FILE *pFile; - //extern CONTROLLER_INFO *joyinfo; extern std::vector joyinfo; extern CONTROLLER_STATE PadState[4]; extern CONTROLLER_MAPPING PadMapping[4];