Rearranged EmuWiimote & nJoy. Wow they can share one pad at the same time, and they also can be enabled/disabled separately.

So as long as the game supports, you can toggle controller input between them on the fly.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4691 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.h

@@ -63,8 +63,8 @@ class WiimoteBasicConfigDialog : public wxDialog
 
 		wxNotebook *m_Notebook;
 		wxPanel *m_Controller[4];
-		wxButton *m_Close,
-				 *m_Apply,
+		wxButton *m_OK,
+				 *m_Cancel,
 				 *m_ButtonMapping,
 				 *m_Recording;
 
@@ -108,8 +108,8 @@ class WiimoteBasicConfigDialog : public wxDialog
 
 		enum
 		{
-			ID_CLOSE = 1000,
-			ID_APPLY,
+			ID_OK = 1000,
+			ID_CANCEL,
 			ID_BUTTONMAPPING,
 			ID_BUTTONRECORDING,
 			IDTM_SHUTDOWN,