From 30db575cb1a7cac00396341f2e2c7d124064b4a9 Mon Sep 17 00:00:00 2001 From: jeblanchard Date: Wed, 4 Jun 2008 00:24:23 +0000 Subject: [PATCH] Fix and plug in MAHJONGDIALOG --- src/drivers/win/input.cpp | 5 ++++- src/drivers/win/res.rc | 33 ++++++++++++++++++++++++--------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/drivers/win/input.cpp b/src/drivers/win/input.cpp index ff5f4177..2eaa3989 100644 --- a/src/drivers/win/input.cpp +++ b/src/drivers/win/input.cpp @@ -1048,7 +1048,7 @@ BOOL CALLBACK InputConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara static const int configurable_nes[6]= { 0, 1, 0, 1, 1, 0 }; - static const int configurable_fam[14]= { 0,0,0,0, 1,1,0,0, 1,1,1,0, 0,0 }; + static const int configurable_fam[14]= { 0,0,0,0, 1,1,0,1, 1,1,1,0, 0,0 }; const unsigned int FAMICOM_POSITION = 2; @@ -1268,6 +1268,9 @@ BOOL CALLBACK InputConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara case SIFC_SUBORKB: DoTBConfig(hwndDlg, text, "SUBORKBDIALOG", suborkbmap, 0x60); break; + case SIFC_MAHJONG: + DoTBConfig(hwndDlg, text, "MAHJONGDIALOG", MahjongButtons, 21); + break; case SIFC_QUIZKING: DoTBConfig(hwndDlg, text, "QUIZKINGDIALOG", QuizKingButtons, 6); break; diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index e8cc9bb2..81a02bce 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -386,19 +386,34 @@ BEGIN CTEXT "3",IDC_STATIC,18,117,8,8 END -MAHJONGDIALOG DIALOG 65510, 106, 216, 91 +MAHJONGDIALOG DIALOG 65510, 106, 340, 110 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "mahjong" FONT 8, "MS Sans Serif" BEGIN - DEFPUSHBUTTON "Close",1,110,73,56,14 - GROUPBOX "",306,8,8,200,55,WS_GROUP - PUSHBUTTON "1",300,72,40,16,12 - PUSHBUTTON "2",301,94,40,16,12 - PUSHBUTTON "3",302,116,40,16,12 - PUSHBUTTON "4",303,138,40,16,12 - PUSHBUTTON "5",304,160,40,16,12 - PUSHBUTTON "6",305,182,40,16,12 + DEFPUSHBUTTON "Close",BTN_CLOSE,277,91,56,14 + GROUPBOX "",306,8,8,324,73,WS_GROUP + PUSHBUTTON "A",300,14,42,16,12 + PUSHBUTTON "B",301,36,42,16,12 + PUSHBUTTON "C",302,58,42,16,12 + PUSHBUTTON "D",303,80,42,16,12 + PUSHBUTTON "E",304,102,42,16,12 + PUSHBUTTON "F",305,124,42,16,12 + PUSHBUTTON "G",306,146,42,16,12 + PUSHBUTTON "H",307,168,42,16,12 + PUSHBUTTON "I",308,190,42,16,12 + PUSHBUTTON "J",309,212,42,16,12 + PUSHBUTTON "K",310,234,42,16,12 + PUSHBUTTON "L",311,256,42,16,12 + PUSHBUTTON "M",312,278,42,16,12 + PUSHBUTTON " ",313,302,40,20,15 + PUSHBUTTON "SEL",314,124,58,16,12 + PUSHBUTTON "ST",315,146,58,16,12 + PUSHBUTTON " ",316,168,58,16,12 + PUSHBUTTON " ",317,190,58,16,12 + PUSHBUTTON " ",318,212,58,16,12 + PUSHBUTTON " ",319,234,58,16,12 + PUSHBUTTON " ",320,256,58,16,12 END MAPINPUT DIALOGEX 0, 0, 322, 293