From f1e58b3c92f962d70d11870121f3ac54b4ce356f Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 12 Apr 2009 21:10:51 +0000 Subject: [PATCH] Win32 - Added Record AVI and Stop avi hotkeys. Minor change to AVI menu items. --- desmume/src/windows/hotkey.cpp | 169 +++++++++++++++++-------------- desmume/src/windows/hotkey.h | 4 +- desmume/src/windows/main.cpp | 4 +- desmume/src/windows/main.h | 2 + desmume/src/windows/resource.h | 4 +- desmume/src/windows/resources.rc | 88 ++++++++-------- 6 files changed, 148 insertions(+), 123 deletions(-) diff --git a/desmume/src/windows/hotkey.cpp b/desmume/src/windows/hotkey.cpp index 03ad0cc2f..b59f0be4b 100644 --- a/desmume/src/windows/hotkey.cpp +++ b/desmume/src/windows/hotkey.cpp @@ -159,6 +159,9 @@ void HK_AutoHoldClearKeyDown(int) { void HK_Reset(int) {ResetGame();} +void HK_RecordAVI(int) {AviRecordTo();} +void HK_StopAVI(int) {AviEnd();} + void HK_ToggleFrame(int) {frameCounterDisplay ^= true;} void HK_ToggleFPS(int) {FpsDisplay ^= true;} void HK_ToggleInput(int) {ShowInputDisplay ^= true;} @@ -235,6 +238,83 @@ void InitCustomKeys (SCustomKeys *keys) i++; }; + //Main Page--------------------------------------- + keys->Reset.handleKeyDown = HK_Reset; + keys->Reset.code = "Reset"; + keys->Reset.name = L"Reset"; + keys->Reset.page = HOTKEY_PAGE_MAIN; + keys->Reset.key = 'R'; + keys->Reset.modifiers = CUSTKEY_CTRL_MASK; + + keys->Pause.handleKeyDown = HK_Pause; + keys->Pause.code = "Pause"; + keys->Pause.name = L"Pause"; + keys->Pause.page = HOTKEY_PAGE_MAIN; + keys->Pause.key = VK_SPACE; + + keys->FrameAdvance.handleKeyDown = HK_FrameAdvance; + keys->FrameAdvance.code = "FrameAdvance"; + keys->FrameAdvance.name = L"Frame Advance"; + keys->FrameAdvance.page = HOTKEY_PAGE_MAIN; + keys->FrameAdvance.key = 'N'; + + keys->FastForward.handleKeyDown = HK_FastForwardKeyDown; + keys->FastForward.handleKeyUp = HK_FastForwardKeyUp; + keys->FastForward.code = "FastForward"; + keys->FastForward.name = L"Fast Forward"; + keys->FastForward.page = HOTKEY_PAGE_MAIN; + keys->FastForward.key = VK_TAB; + + keys->FastForwardToggle.handleKeyDown = HK_FastForwardToggle; + keys->FastForwardToggle.code = "FastForwardToggle"; + keys->FastForwardToggle.name = L"Fast Forward Toggle"; + keys->FastForwardToggle.page = HOTKEY_PAGE_MAIN; + keys->FastForwardToggle.key = NULL; + + keys->IncreaseSpeed.handleKeyDown = HK_IncreaseSpeed; + keys->IncreaseSpeed.code = "IncreaseSpeed"; + keys->IncreaseSpeed.name = L"Increase Speed"; + keys->IncreaseSpeed.page = HOTKEY_PAGE_MAIN; + keys->IncreaseSpeed.key = VK_OEM_PLUS; + + keys->DecreaseSpeed.handleKeyDown = HK_DecreaseSpeed; + keys->DecreaseSpeed.code = "DecreaseSpeed"; + keys->DecreaseSpeed.name = L"Decrease Speed"; + keys->DecreaseSpeed.page = HOTKEY_PAGE_MAIN; + keys->DecreaseSpeed.key = VK_OEM_MINUS; + + keys->Microphone.handleKeyDown = HK_MicrophoneKeyDown; + keys->Microphone.handleKeyUp = HK_MicrophoneKeyUp; + keys->Microphone.code = "Microphone"; + keys->Microphone.name = L"Microphone"; + keys->Microphone.page = HOTKEY_PAGE_MAIN; + keys->Microphone.key = NULL; + + keys->AutoHold.handleKeyDown = HK_AutoHoldKeyDown; + keys->AutoHold.handleKeyUp = HK_AutoHoldKeyUp; + keys->AutoHold.code = "AutoHold"; + keys->AutoHold.name = L"Auto-Hold"; + keys->AutoHold.page = HOTKEY_PAGE_MAIN; + keys->AutoHold.key = NULL; + + keys->AutoHoldClear.handleKeyDown = HK_AutoHoldClearKeyDown; + keys->AutoHoldClear.code = "AutoHoldClear"; + keys->AutoHoldClear.name = L"Auto-Hold Clear"; + keys->AutoHoldClear.page = HOTKEY_PAGE_MAIN; + keys->AutoHoldClear.key = NULL; + + keys->ToggleRasterizer.handleKeyDown = HK_ToggleRasterizer; + keys->ToggleRasterizer.code = "ToggleRasterizer"; + keys->ToggleRasterizer.name = L"Toggle Rasterizer"; + keys->ToggleRasterizer.page = HOTKEY_PAGE_MAIN; + keys->ToggleRasterizer.key = VK_SUBTRACT; + + keys->PrintScreen.handleKeyDown = HK_PrintScreen; + keys->PrintScreen.code = "SaveScreenshotas"; + keys->PrintScreen.name = L"Save Screenshot as"; + keys->PrintScreen.page = HOTKEY_PAGE_MAIN; + keys->PrintScreen.key = VK_F12; + keys->ToggleFrameCounter.handleKeyDown = HK_ToggleFrame; keys->ToggleFrameCounter.code = "ToggleFrameDisplay"; keys->ToggleFrameCounter.name = L"Toggle Frame Display"; @@ -258,20 +338,20 @@ void InitCustomKeys (SCustomKeys *keys) keys->ToggleLag.name = L"Toggle Lag Display"; keys->ToggleLag.page = HOTKEY_PAGE_MAIN; keys->ToggleLag.key = NULL; - - keys->Reset.handleKeyDown = HK_Reset; - keys->Reset.code = "Reset"; - keys->Reset.name = L"Reset"; - keys->Reset.page = HOTKEY_PAGE_MAIN; - keys->Reset.key = 'R'; - keys->Reset.modifiers = CUSTKEY_CTRL_MASK; - keys->Pause.handleKeyDown = HK_Pause; - keys->Pause.code = "Pause"; - keys->Pause.name = L"Pause"; - keys->Pause.page = HOTKEY_PAGE_MAIN; - keys->Pause.key = VK_SPACE; + keys->RecordAVI.handleKeyDown = HK_RecordAVI; + keys->RecordAVI.code = "RecordAVI"; + keys->RecordAVI.name = L"Record AVI"; + keys->RecordAVI.page = HOTKEY_PAGE_MAIN; + keys->RecordAVI.key = NULL; + keys->StopAVI.handleKeyDown = HK_StopAVI; + keys->StopAVI.code = "StopAVI"; + keys->StopAVI.name = L"Stop AVI"; + keys->StopAVI.page = HOTKEY_PAGE_MAIN; + keys->StopAVI.key = NULL; + + //Turbo Page--------------------------------------- keys->TurboRight.handleKeyDown = HK_TurboRightKeyDown; keys->TurboRight.handleKeyUp = HK_TurboRightKeyUp; keys->TurboRight.code = "TurboRight"; @@ -279,19 +359,6 @@ void InitCustomKeys (SCustomKeys *keys) keys->TurboRight.page = HOTKEY_PAGE_TURBO; keys->TurboRight.key = NULL; - keys->AutoHoldClear.handleKeyDown = HK_AutoHoldClearKeyDown; - keys->AutoHoldClear.code = "AutoHoldClear"; - keys->AutoHoldClear.name = L"Auto-Hold Clear"; - keys->AutoHoldClear.page = HOTKEY_PAGE_MAIN; - keys->AutoHoldClear.key = NULL; - - keys->AutoHold.handleKeyDown = HK_AutoHoldKeyDown; - keys->AutoHold.handleKeyUp = HK_AutoHoldKeyUp; - keys->AutoHold.code = "AutoHold"; - keys->AutoHold.name = L"Auto-Hold"; - keys->AutoHold.page = HOTKEY_PAGE_MAIN; - keys->AutoHold.key = NULL; - keys->TurboLeft.handleKeyDown = HK_TurboLeftKeyDown; keys->TurboLeft.handleKeyUp = HK_TurboLeftKeyUp; keys->TurboLeft.code = "TurboLeft"; @@ -354,57 +421,7 @@ void InitCustomKeys (SCustomKeys *keys) keys->TurboStart.name = L"Turbo Start"; keys->TurboStart.page = HOTKEY_PAGE_TURBO; keys->TurboStart.key = NULL; - - keys->FastForward.handleKeyDown = HK_FastForwardKeyDown; - keys->FastForward.handleKeyUp = HK_FastForwardKeyUp; - keys->FastForward.code = "FastForward"; - keys->FastForward.name = L"Fast Forward"; - keys->FastForward.page = HOTKEY_PAGE_MAIN; - keys->FastForward.key = VK_TAB; - - keys->FastForwardToggle.handleKeyDown = HK_FastForwardToggle; - keys->FastForwardToggle.code = "FastForwardToggle"; - keys->FastForwardToggle.name = L"Fast Forward Toggle"; - keys->FastForwardToggle.page = HOTKEY_PAGE_MAIN; - keys->FastForwardToggle.key = NULL; - - keys->IncreaseSpeed.handleKeyDown = HK_IncreaseSpeed; - keys->IncreaseSpeed.code = "IncreaseSpeed"; - keys->IncreaseSpeed.name = L"Increase Speed"; - keys->IncreaseSpeed.page = HOTKEY_PAGE_MAIN; - keys->IncreaseSpeed.key = VK_OEM_PLUS; - - keys->DecreaseSpeed.handleKeyDown = HK_DecreaseSpeed; - keys->DecreaseSpeed.code = "DecreaseSpeed"; - keys->DecreaseSpeed.name = L"Decrease Speed"; - keys->DecreaseSpeed.page = HOTKEY_PAGE_MAIN; - keys->DecreaseSpeed.key = VK_OEM_MINUS; - - keys->FrameAdvance.handleKeyDown = HK_FrameAdvance; - keys->FrameAdvance.code = "FrameAdvance"; - keys->FrameAdvance.name = L"Frame Advance"; - keys->FrameAdvance.page = HOTKEY_PAGE_MAIN; - keys->FrameAdvance.key = 'N'; - - keys->ToggleRasterizer.handleKeyDown = HK_ToggleRasterizer; - keys->ToggleRasterizer.code = "ToggleRasterizer"; - keys->ToggleRasterizer.name = L"Toggle Rasterizer"; - keys->ToggleRasterizer.page = HOTKEY_PAGE_MAIN; - keys->ToggleRasterizer.key = VK_SUBTRACT; - - keys->PrintScreen.handleKeyDown = HK_PrintScreen; - keys->PrintScreen.code = "SaveScreenshotas"; - keys->PrintScreen.name = L"Save Screenshot as"; - keys->PrintScreen.page = HOTKEY_PAGE_MAIN; - keys->PrintScreen.key = VK_F12; - - keys->Microphone.handleKeyDown = HK_MicrophoneKeyDown; - keys->Microphone.handleKeyUp = HK_MicrophoneKeyUp; - keys->Microphone.code = "Microphone"; - keys->Microphone.name = L"Microphone"; - keys->Microphone.page = HOTKEY_PAGE_MAIN; - keys->Microphone.key = NULL; - + keys->QuickSave.handleKeyDown = HK_StateQuickSaveSlot; keys->QuickSave.code = "QuickSave"; keys->QuickSave.name = L"Quick Save"; diff --git a/desmume/src/windows/hotkey.h b/desmume/src/windows/hotkey.h index 360ccb55b..70ad96d31 100644 --- a/desmume/src/windows/hotkey.h +++ b/desmume/src/windows/hotkey.h @@ -72,8 +72,10 @@ struct SCustomKeys SCustomKey AutoHold, AutoHoldClear; SCustomKey ToggleRasterizer; + SCustomKey PrintScreen; //Screenshot + + SCustomKey RecordAVI, StopAVI; - SCustomKey PrintScreen; SCustomKey ToggleFrameCounter; SCustomKey ToggleFPS; SCustomKey ToggleInput; diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index f3c8b6a30..cf055bab6 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -2031,7 +2031,7 @@ void SetRotate(HWND hwnd, int rot) UpdateScreenRects(); } -static void AviEnd() +void AviEnd() { NDS_Pause(); DRV_AviEnd(); @@ -2039,7 +2039,7 @@ static void AviEnd() } //Shows an Open File menu and starts recording an AVI -static void AviRecordTo() +void AviRecordTo() { NDS_Pause(); diff --git a/desmume/src/windows/main.h b/desmume/src/windows/main.h index 34a37b613..fae1614fe 100644 --- a/desmume/src/windows/main.h +++ b/desmume/src/windows/main.h @@ -13,6 +13,8 @@ void Display(); void Pause(); void FrameAdvance(); void ResetGame(); //Resets game (for the menu item & hotkey +void AviRecordTo(); +void AviEnd(); extern bool ShowInputDisplay; extern bool frameCounterDisplay; diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h index 7cc7bbe0c..1efb2c96a 100644 --- a/desmume/src/windows/resource.h +++ b/desmume/src/windows/resource.h @@ -422,8 +422,8 @@ #define ID_VIEW_DISPLAYFPS 40010 #define ID_VIEW_DISPLAYINPUT 40011 #define ID_VIEW_DISPLAYLAG 40012 -#define ID_VIEW_HUDEDITOR 40013 -#define ID_VIEW_DISPLAYMICROPHONE 40014 +#define ID_VIEW_HUDEDITOR 40013 +#define ID_VIEW_DISPLAYMICROPHONE 40014 #define IDM_FILE_RECORDAVI 40015 #define IDM_FILE_STOPAVI 40016 #define ACCEL_CTRL_O 40032 diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index 1b3869b19..0a0587563 100644 --- a/desmume/src/windows/resources.rc +++ b/desmume/src/windows/resources.rc @@ -68,7 +68,7 @@ MENU_PRINCIPAL MENU MENUITEM "Gem Skærmbillede &Som...", IDM_PRINTSCREEN MENUITEM "&Hurtigt Skærmbillede", IDM_QUICK_PRINTSCREEN MENUITEM SEPARATOR - MENUITEM "Record AVI", IDM_FILE_RECORDAVI + MENUITEM "Record &AVI...", IDM_FILE_RECORDAVI MENUITEM "Stop AVI", IDM_FILE_STOPAVI MENUITEM SEPARATOR MENUITEM "&Afslut\tAlt F4", IDM_QUIT @@ -115,8 +115,8 @@ MENU_PRINCIPAL MENU MENUITEM "Display Fps", ID_VIEW_DISPLAYFPS MENUITEM "Display Input", ID_VIEW_DISPLAYINPUT MENUITEM "Display Lag Counter", ID_VIEW_DISPLAYLAG - MENUITEM "Display Microphone", ID_VIEW_DISPLAYMICROPHONE - MENUITEM "HUD Editing Mode", ID_VIEW_HUDEDITOR + MENUITEM "Display Microphone", ID_VIEW_DISPLAYMICROPHONE + MENUITEM "HUD Editing Mode", ID_VIEW_HUDEDITOR } POPUP "&Konfigure" { @@ -136,7 +136,7 @@ MENU_PRINCIPAL MENU MENUITEM "Wifi settings", IDM_WIFISETTINGS, GRAYED MENUITEM "Firmware Indstillinger", IDM_FIRMSETTINGS MENUITEM "Emulation settings", IDM_EMULATIONSETTINGS - MENUITEM "Microphone Settings", IDM_MICROPHONESETTINGS + MENUITEM "Microphone Settings", IDM_MICROPHONESETTINGS POPUP "&Frame Skip" { MENUITEM "Limit framerate", IDC_FRAMELIMIT @@ -238,7 +238,7 @@ MENU_PRINCIPAL MENU MENUITEM "Save Screenshot &As...", IDM_PRINTSCREEN MENUITEM "&Quick Screenshot", IDM_QUICK_PRINTSCREEN MENUITEM SEPARATOR - MENUITEM "Record AVI", IDM_FILE_RECORDAVI + MENUITEM "Record &AVI...", IDM_FILE_RECORDAVI MENUITEM "Stop AVI", IDM_FILE_STOPAVI MENUITEM SEPARATOR MENUITEM "&Quit\tAlt F4", IDM_QUIT @@ -287,8 +287,8 @@ MENU_PRINCIPAL MENU MENUITEM "Display FPS", ID_VIEW_DISPLAYFPS MENUITEM "Display Input", ID_VIEW_DISPLAYINPUT MENUITEM "Display Lag Counter", ID_VIEW_DISPLAYLAG - MENUITEM "Display Microphone", ID_VIEW_DISPLAYMICROPHONE - MENUITEM "HUD Editing Mode", ID_VIEW_HUDEDITOR + MENUITEM "Display Microphone", ID_VIEW_DISPLAYMICROPHONE + MENUITEM "HUD Editing Mode", ID_VIEW_HUDEDITOR } POPUP "&Config" { @@ -309,7 +309,7 @@ MENU_PRINCIPAL MENU MENUITEM "Wifi settings", IDM_WIFISETTINGS, GRAYED MENUITEM "Firmware Settings", IDM_FIRMSETTINGS MENUITEM "Emulation Settings", IDM_EMULATIONSETTINGS - MENUITEM "Microphone Settings", IDM_MICROPHONESETTINGS + MENUITEM "Microphone Settings", IDM_MICROPHONESETTINGS POPUP "&Frame Skip" { MENUITEM "Limit framerate", IDC_FRAMELIMIT @@ -458,8 +458,8 @@ MENU_PRINCIPAL MENU MENUITEM "Framerate", ID_VIEW_DISPLAYFPS MENUITEM "Display Input", ID_VIEW_DISPLAYINPUT MENUITEM "Display Lag Counter", ID_VIEW_DISPLAYLAG - MENUITEM "Display Microphone", ID_VIEW_DISPLAYMICROPHONE - MENUITEM "HUD Editing Mode", ID_VIEW_HUDEDITOR + MENUITEM "Display Microphone", ID_VIEW_DISPLAYMICROPHONE + MENUITEM "HUD Editing Mode", ID_VIEW_HUDEDITOR } POPUP "&Config" { @@ -479,7 +479,7 @@ MENU_PRINCIPAL MENU MENUITEM "Config. wifi", IDM_WIFISETTINGS, GRAYED MENUITEM "Config. du firmware", IDM_FIRMSETTINGS MENUITEM "Config. d'émulation", IDM_EMULATIONSETTINGS - MENUITEM "Microphone Settings", IDM_MICROPHONESETTINGS + MENUITEM "Microphone Settings", IDM_MICROPHONESETTINGS POPUP "&Frame Skip" { MENUITEM "Limit framerate", IDC_FRAMELIMIT @@ -1235,28 +1235,6 @@ FONT 8, "MS Sans Serif", 0, 0, 1 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_MEM_VIEW DIALOG 0, 0, 436, 231 -STYLE DS_CENTER | DS_FIXEDSYS | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU -CAPTION "" -FONT 8, "MS Sans Serif" -BEGIN - PUSHBUTTON "Close", IDCANCEL, 188, 210, 60, 15, BS_PUSHBUTTON - GROUPBOX "View mode", IDC_STATIC, 5, 5, 145, 35 - RADIOBUTTON "8-bit", IDC_8_BIT, 15, 20, 40, 10, WS_GROUP | WS_TABSTOP | BS_RADIOBUTTON - RADIOBUTTON "16-bit", IDC_16_BIT, 60, 20, 39, 10, WS_GROUP | WS_TABSTOP | BS_RADIOBUTTON - RADIOBUTTON "32-bit", IDC_32_BIT, 105, 20, 39, 10, WS_GROUP | WS_TABSTOP | BS_RADIOBUTTON - GROUPBOX "View address", IDC_STATIC, 160, 5, 115, 35 - PUSHBUTTON "Go", IDC_GO, 240, 20, 25, 14, BS_PUSHBUTTON - PUSHBUTTON "Text dump", IDC_TEXTDUMP, 295, 20, 60, 14, BS_PUSHBUTTON - CONTROL "1", IDC_MEMVIEWBOX, "MemView_ViewBox", 0x50210000, 5, 45, 425, 160 - EDITTEXT IDC_ADDRESS, 170, 20, 70, 14, ES_AUTOHSCROLL, WS_EX_TRANSPARENT - PUSHBUTTON "Raw dump", IDC_RAWDUMP, 360, 20, 60, 14, BS_PUSHBUTTON - GROUPBOX "View dump", IDC_STATIC, 285, 5, 145, 35 -END - - - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_EMULATIONSETTINGS DIALOG 0, 0, 241, 270 STYLE DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU @@ -2126,6 +2104,30 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 LTEXT "frames", IDC_STATIC, 92, 158, 16, 8, SS_LEFT } + + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +IDD_MEM_VIEW DIALOG 0, 0, 436, 231 +STYLE DS_CENTER | DS_SHELLFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU +CAPTION "" +FONT 8, "MS Sans Serif" +{ + PUSHBUTTON "Close", IDCANCEL, 188, 210, 60, 15, BS_PUSHBUTTON + GROUPBOX "View mode", IDC_STATIC, 5, 5, 145, 35 + RADIOBUTTON "8-bit", IDC_8_BIT, 15, 20, 40, 10, WS_GROUP | WS_TABSTOP | BS_RADIOBUTTON + RADIOBUTTON "16-bit", IDC_16_BIT, 60, 20, 39, 10, WS_GROUP | WS_TABSTOP | BS_RADIOBUTTON + RADIOBUTTON "32-bit", IDC_32_BIT, 105, 20, 39, 10, WS_GROUP | WS_TABSTOP | BS_RADIOBUTTON + GROUPBOX "View address", IDC_STATIC, 160, 5, 115, 35 + PUSHBUTTON "Go", IDC_GO, 240, 20, 25, 14, BS_PUSHBUTTON + PUSHBUTTON "Text dump", IDC_TEXTDUMP, 295, 20, 60, 14, BS_PUSHBUTTON + CONTROL "1", IDC_MEMVIEWBOX, "MemView_ViewBox", 0x50210000, 5, 45, 425, 160 + EDITTEXT IDC_ADDRESS, 170, 20, 70, 14, ES_AUTOHSCROLL, WS_EX_TRANSPARENT + PUSHBUTTON "Raw dump", IDC_RAWDUMP, 360, 20, 60, 14, BS_PUSHBUTTON + GROUPBOX "View dump", IDC_STATIC, 285, 5, 145, 35 +} + + + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_MICROPHONE DIALOG 0, 0, 241, 111 STYLE DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU @@ -2141,6 +2143,8 @@ FONT 8, "MS Sans Serif" PUSHBUTTON "...", IDC_MICSAMPLEBROWSE, 205, 46, 20, 14, BS_PUSHBUTTON } + + LANGUAGE LANG_DANISH, SUBLANG_DANISH_DENMARK IDD_OAM DIALOGEX 0, 0, 300, 200 STYLE DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU @@ -2148,7 +2152,7 @@ CAPTION "OAM Fremviser" FONT 8, "MS Sans Serif", 0, 0, 1 { 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, NOT 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 @@ -2184,7 +2188,7 @@ CAPTION "OAM Viewer" FONT 8, "MS Sans Serif", 0, 0, 1 { 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, NOT 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 @@ -2220,7 +2224,7 @@ CAPTION "OAM Viewer" FONT 8, "MS Sans Serif", 0, 0, 1 { 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, NOT 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 @@ -2257,7 +2261,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1 { 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, NOT 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 @@ -2275,7 +2279,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1 { 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, NOT 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 @@ -2293,7 +2297,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1 { 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, NOT WS_VISIBLE AUTOCHECKBOX "Auto-update", IDC_AUTO_UPDATE, 60, 18, 75, 14, BS_AUTOCHECKBOX PUSHBUTTON "&Fermer", IDC_FERMER, 35, 169, 50, 14, BS_PUSHBUTTON AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE2, 13, 150, 54, 14, BS_AUTOCHECKBOX @@ -2352,7 +2356,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1 { 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, NOT 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 @@ -2377,7 +2381,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1 { 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, NOT 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 @@ -2402,7 +2406,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1 { 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, NOT 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