From 26552968b7f41fd2fe959eb45770e9557fd8dc72 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Tue, 7 Oct 2008 19:29:30 +0000
Subject: [PATCH] updated njoy so it now shows it's beautiful aboutbox too.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@790 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 .../Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp     | 22 +++++++++++++++++++
 .../Plugin_nJoy_SDL/Src/GUI/ConfigBox.h       |  5 ++++-
 Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp   | 21 ------------------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
index 5317f32116..babb9b977d 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
@@ -47,6 +47,7 @@ static const char* ControllerType[] =
 
 BEGIN_EVENT_TABLE(ConfigBox,wxDialog)
 	EVT_CLOSE(ConfigBox::OnClose)
+	EVT_BUTTON(ID_ABOUT, ConfigBox::AboutClick)
 	EVT_BUTTON(ID_OK, ConfigBox::OKClick)
 	EVT_BUTTON(ID_CANCEL, ConfigBox::CancelClick)
 	EVT_COMBOBOX(IDC_JOYNAME, ConfigBox::ChangeJoystick)
@@ -105,6 +106,7 @@ void ConfigBox::CreateGUIControls()
 #endif
 
 	// Buttons
+	m_About = new wxButton(this, ID_ABOUT, wxT("About"), wxPoint(0, 497), wxSize(75, 25), 0, wxDefaultValidator, wxT("About"));
 	m_OK = new wxButton(this, ID_OK, wxT("OK"), wxPoint(475, 497), wxSize(75, 25), 0, wxDefaultValidator, wxT("OK"));
 	m_Cancel = new wxButton(this, ID_CANCEL, wxT("Cancel"), wxPoint(556, 497), wxSize(75, 25), 0, wxDefaultValidator, wxT("Cancel"));
 
@@ -278,6 +280,26 @@ void ConfigBox::OnClose(wxCloseEvent& /*event*/)
 	EndModal(0);
 }
 
+void ConfigBox::AboutClick(wxCommandEvent& event)
+{
+// Call about dialog
+// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
+#ifdef _WIN32
+	wxWindow win;
+	win.SetHWND((WXHWND)this->GetHWND());
+	win.Enable(false);  
+
+	AboutBox frame(&win);
+	frame.ShowModal();
+
+	win.Enable(true);
+	win.SetHWND(0); 
+#else
+	AboutBox frame(NULL);
+	frame.ShowModal();
+#endif	
+}
+
 void ConfigBox::OKClick(wxCommandEvent& event)
 {
 	if (event.GetId() == ID_OK)
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.h b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.h
index b9c3dc1b03..df745dfc55 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.h
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.h
@@ -59,6 +59,7 @@ class ConfigBox : public wxDialog
 		virtual ~ConfigBox();
 		
 	private:
+		wxButton *m_About;
 		wxButton *m_OK;
 		wxButton *m_Cancel;
 				
@@ -136,7 +137,8 @@ class ConfigBox : public wxDialog
 	private:
 		enum
 		{
-			ID_OK = 1000,
+			ID_ABOUT = 1000,
+			ID_OK,
 			ID_CANCEL,
 			ID_NOTEBOOK,
 			ID_CONTROLLERPAGE1,
@@ -212,6 +214,7 @@ class ConfigBox : public wxDialog
 		};
 	
 	private:
+		void AboutClick(wxCommandEvent& event);
 		void OKClick(wxCommandEvent& event);
 		void CancelClick(wxCommandEvent& event);
 
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
index feae4d66f7..ed2139626d 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
@@ -149,27 +149,6 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
 #endif
 }
 
-// Call about dialog
-// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
-void DllAbout(HWND _hParent)
-{	
-	#ifdef _WIN32
-	wxWindow win;
-	win.SetHWND((WXHWND)_hParent);
-	win.Enable(false);  
-	
-	AboutBox frame(&win);
-	frame.ShowModal();
-
-	win.Enable(true);
-	win.SetHWND(0); 
-
-	#else
-		AboutBox frame(NULL);
-		frame.ShowModal();
-	#endif	
-}
-
 // Call config dialog
 // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
 void DllConfig(HWND _hParent)