From ef590739dad559b555e28f1015cb565da4bcc2e8 Mon Sep 17 00:00:00 2001 From: luigi__ Date: Sun, 17 May 2009 00:59:59 +0000 Subject: [PATCH] Oh shit... tiny fix to the I/O reg dialog. --- desmume/src/windows/resource.h | 1 - desmume/src/windows/resources.rc | 40 ++++++++++++++++---------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h index 8d10281eb..dfeadde22 100644 --- a/desmume/src/windows/resource.h +++ b/desmume/src/windows/resource.h @@ -242,7 +242,6 @@ #define IDC_EDIT11 1004 #define IDC_GI_GAMECODE 1004 #define IDC_ROTATE90 1004 -#define IDC_SPU_INTERPOLATION_CB 1004 #define IDC_ARM7BIOS 1005 #define IDC_EDIT07 1005 #define IDC_ROTATE180 1005 diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index 05506b2c3..4142022ae 100644 --- a/desmume/src/windows/resources.rc +++ b/desmume/src/windows/resources.rc @@ -1278,15 +1278,6 @@ END -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_IOREG_VIEW_CP15 DIALOG 0, 20, 625, 455 -STYLE DS_FIXEDSYS | WS_VISIBLE | WS_CHILDWINDOW -FONT 8, "MS Sans Serif" -BEGIN -END - - - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_EDITWATCH DIALOGEX 0, 0, 181, 95 STYLE DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU @@ -1774,13 +1765,22 @@ END LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_IOREG_VIEW DIALOG 0, 0, 625, 494 +IDD_IOREG_VIEW DIALOG 0, 0, 625, 480 STYLE DS_CENTER | DS_SHELLFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_CLIPSIBLINGS | WS_DLGFRAME | WS_SYSMENU CAPTION "" FONT 8, "Ms Shell Dlg" BEGIN CONTROL "", IDC_IOREG_TAB, WC_TABCONTROL, TCS_BUTTONS, 5, 5, 455, 15 - PUSHBUTTON "Close", IDC_CLOSE, 287, 475, 55, 15, BS_PUSHBUTTON + PUSHBUTTON "Close", IDC_CLOSE, 287, 460, 55, 15, BS_PUSHBUTTON +END + + + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +IDD_IOREG_VIEW_CP15 DIALOG 0, 20, 625, 455 +STYLE DS_SHELLFONT | WS_VISIBLE | WS_CHILDWINDOW +FONT 8, "MS Sans Serif" +BEGIN END @@ -3254,7 +3254,7 @@ CAPTION "OAM Fremviser" FONT 8, "MS Sans Serif", 0, 0, 1 BEGIN COMBOBOX IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWNLIST - SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, WS_VISIBLE + SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, WS_VISIBLE | WS_VISIBLE LTEXT "Mode :", IDC_STATIC, 4, 36, 45, 8, SS_LEFT LTEXT "Tile :", IDC_STATIC, 4, 46, 45, 8, SS_LEFT LTEXT "Palette :", IDC_STATIC, 4, 56, 45, 8, SS_LEFT @@ -3290,7 +3290,7 @@ CAPTION "OAM Viewer" FONT 8, "MS Sans Serif", 0, 0, 1 BEGIN COMBOBOX IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWNLIST - SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, WS_VISIBLE + SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, WS_VISIBLE | WS_VISIBLE LTEXT "Mode :", IDC_STATIC, 4, 36, 45, 8, SS_LEFT LTEXT "Tile :", IDC_STATIC, 4, 46, 45, 8, SS_LEFT LTEXT "Palette :", IDC_STATIC, 4, 56, 45, 8, SS_LEFT @@ -3326,7 +3326,7 @@ CAPTION "OAM Viewer" FONT 8, "MS Sans Serif", 0, 0, 1 BEGIN COMBOBOX IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWNLIST - SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, WS_VISIBLE + SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, WS_VISIBLE | WS_VISIBLE LTEXT "Mode :", IDC_STATIC, 4, 36, 45, 8, SS_LEFT LTEXT "Tile :", IDC_STATIC, 4, 46, 45, 8, SS_LEFT LTEXT "Palette :", IDC_STATIC, 4, 56, 45, 8, SS_LEFT @@ -3363,7 +3363,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1 BEGIN COMBOBOX IDC_PAL_SELECT, 15, 3, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Pal : 0", IDC_PALNUM, 3, 21, 25, 8, SS_LEFT - SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, WS_VISIBLE + SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, WS_VISIBLE | WS_VISIBLE PUSHBUTTON "&Luk", IDC_FERMER, 35, 169, 50, 14, BS_PUSHBUTTON AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 13, 150, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY @@ -3381,7 +3381,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1 BEGIN COMBOBOX IDC_PAL_SELECT, 15, 3, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Pal : 0", IDC_PALNUM, 3, 21, 25, 8, SS_LEFT - SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, WS_VISIBLE + SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, WS_VISIBLE | WS_VISIBLE PUSHBUTTON "&Close", IDC_FERMER, 35, 169, 50, 14, BS_PUSHBUTTON AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 13, 150, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY @@ -3399,7 +3399,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1 BEGIN COMBOBOX IDC_PAL_SELECT, 15, 3, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Pal : 0", IDC_PALNUM, 3, 21, 25, 8, SS_LEFT - SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, WS_VISIBLE + SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, WS_VISIBLE | WS_VISIBLE PUSHBUTTON "&Fermer", IDC_FERMER, 35, 169, 50, 14, BS_PUSHBUTTON AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 13, 150, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY @@ -3589,7 +3589,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1 BEGIN COMBOBOX IDC_PAL_SELECT, 4, 13, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Pal : 0", IDC_PALNUM, 4, 31, 25, 8, SS_LEFT - SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, WS_VISIBLE + SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, WS_VISIBLE | WS_VISIBLE COMBOBOX IDC_MEM_SELECT, 4, 50, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN AUTORADIOBUTTON "Bitmap", IDC_BITMAP, 4, 68, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "256 Farver", IDC_256COUL, 4, 80, 55, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -3614,7 +3614,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1 BEGIN COMBOBOX IDC_PAL_SELECT, 4, 13, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Pal : 0", IDC_PALNUM, 4, 31, 25, 8, SS_LEFT - SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, WS_VISIBLE + SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, WS_VISIBLE | WS_VISIBLE COMBOBOX IDC_MEM_SELECT, 4, 50, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN AUTORADIOBUTTON "Bitmap", IDC_BITMAP, 4, 68, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "256 colors", IDC_256COUL, 4, 80, 55, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -3639,7 +3639,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1 BEGIN COMBOBOX IDC_PAL_SELECT, 4, 13, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Pal : 0", IDC_PALNUM, 4, 31, 25, 8, SS_LEFT - SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, WS_VISIBLE + SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, WS_VISIBLE | WS_VISIBLE COMBOBOX IDC_MEM_SELECT, 4, 50, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN AUTORADIOBUTTON "Bitmap", IDC_BITMAP, 4, 68, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "256 couleurs", IDC_256COUL, 4, 80, 55, 10, WS_TABSTOP | BS_AUTORADIOBUTTON