From c78eb75ccfbebe8cc34789070af9c80fd0e58aee Mon Sep 17 00:00:00 2001
From: Nekokabu <nekokabu@gmail.com>
Date: Sat, 14 Mar 2015 02:37:32 +0900
Subject: [PATCH] Enable "Use System Font"

---
 .../Project64/User Interface/UI Resources.rc  | 105 +++++++++---------
 1 file changed, 55 insertions(+), 50 deletions(-)

diff --git a/Source/Project64/User Interface/UI Resources.rc b/Source/Project64/User Interface/UI Resources.rc
index e92dd3823..5e49cceb3 100644
--- a/Source/Project64/User Interface/UI Resources.rc	
+++ b/Source/Project64/User Interface/UI Resources.rc	
@@ -1,3 +1,4 @@
+
 // Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
@@ -74,7 +75,7 @@ IDI_LEFT                ICON                    "Icons\\left.ico"
 //
 
 IDD_Settings_PlugSel DIALOGEX 0, 0, 231, 206
-STYLE DS_SETFONT | DS_CENTER | WS_CHILD | WS_VISIBLE
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD | WS_VISIBLE
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -127,7 +128,7 @@ BEGIN
 END
 
 IDD_Settings_RomBrowser DIALOGEX 0, 0, 231, 206
-STYLE DS_SETFONT | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -145,7 +146,7 @@ BEGIN
 END
 
 IDD_Settings_General DIALOGEX 0, 0, 231, 210
-STYLE DS_SETFONT | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -166,7 +167,7 @@ BEGIN
 END
 
 IDD_Rom_Information DIALOGEX 0, 0, 239, 207
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Rom Information"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -225,14 +226,14 @@ BEGIN
 END
 
 IDD_Settings_Accelerator DIALOGEX 0, 0, 218, 183
-STYLE DS_SETFONT | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     LTEXT           "CPU State:",IDC_S_CPU_STATE,8,9,42,11
     COMBOBOX        IDC_C_CPU_STATE,58,7,156,66,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Menu Item:",IDC_MENU_ITEM_TEXT,8,23,84,10
-    CONTROL         "Tree1",IDC_MENU_ITEMS,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_NOTOOLTIPS | TVS_TRACKSELECT | WS_BORDER | WS_TABSTOP,8,33,128,78
+    CONTROL         "Tree1",IDC_MENU_ITEMS,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_NOTOOLTIPS | TVS_TRACKSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,8,33,128,78
     LTEXT           "Current Keys:",IDC_S_CURRENT_KEYS,142,23,52,10
     LISTBOX         IDC_CURRENT_KEYS,144,33,68,59,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Remove",IDC_REMOVE,144,97,68,12
@@ -247,16 +248,16 @@ BEGIN
     LTEXT           "",IDC_ASSIGNED_MENU_ITEM,89,155,118,9
 END
 
-IDD_Key_Prompt DIALOG  0, 0, 105, 43
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
-FONT 8, "MS Shell Dlg"
+IDD_Key_Prompt DIALOGEX 0, 0, 105, 43
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,5,24,50,14
     LTEXT           "Press a key to be used as an accelerator",IDC_STATIC,5,3,96,19
 END
 
 IDD_Cheats_Select DIALOGEX 0, 0, 412, 226
-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Cheats"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -264,7 +265,7 @@ BEGIN
 END
 
 IDD_Cheats_List DIALOGEX 0, 0, 201, 221
-STYLE DS_SETFONT | DS_CONTROL | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -275,7 +276,7 @@ BEGIN
 END
 
 IDD_Cheats_Add DIALOGEX 0, 0, 191, 215
-STYLE DS_SETFONT | DS_CENTER | WS_CHILD | WS_VISIBLE
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD | WS_VISIBLE
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -295,7 +296,7 @@ BEGIN
 END
 
 IDD_Cheats_CodeEx DIALOGEX 0, 0, 186, 153
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_TOOLWINDOW
 CAPTION "Code Extensions"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -308,7 +309,7 @@ BEGIN
 END
 
 IDD_Cheats_Range DIALOGEX 0, 0, 183, 127
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_TOOLWINDOW
 CAPTION "Quantity Digit"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -341,7 +342,7 @@ BEGIN
 END
 
 IDD_Settings_ShellInt DIALOGEX 0, 0, 231, 206
-STYLE DS_SETFONT | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -356,10 +357,10 @@ BEGIN
     CONTROL         ".usa",IDC_USA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,134,37,9
 END
 
-IDD_About_Ini DIALOG  0, 0, 185, 250
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_About_Ini DIALOGEX 0, 0, 185, 250
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About INI Files"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX        "ROM Database (.RDB)",IDC_RDB,5,46,175,59
     LTEXT           "Author:",IDC_RDB_AUTHOR,12,57,166,8
@@ -384,7 +385,7 @@ BEGIN
 END
 
 IDD_About DIALOGEX 0, 0, 254, 258
-STYLE DS_SETFONT | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 EXSTYLE WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -404,7 +405,7 @@ BEGIN
 END
 
 IDD_Logging_General DIALOGEX 0, 0, 200, 154
-STYLE DS_SETFONT | DS_CONTROL | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -420,7 +421,7 @@ BEGIN
 END
 
 IDD_Logging_PifRam DIALOGEX 0, 0, 200, 154
-STYLE DS_SETFONT | DS_CONTROL | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -436,7 +437,7 @@ BEGIN
 END
 
 IDD_Logging_Registers DIALOGEX 0, 0, 200, 154
-STYLE DS_SETFONT | DS_CONTROL | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -460,10 +461,10 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,133,178,9
 END
 
-IDD_Debugger_TLB DIALOG  0, 0, 290, 326
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_Debugger_TLB DIALOGEX 0, 0, 290, 326
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TLB"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT           "View:",IDC_STATIC,10,7,25,11
     CONTROL         "TLB Entries",IDC_TLB_ENTRIES,"Button",BS_AUTORADIOBUTTON,40,7,65,11
@@ -472,10 +473,10 @@ BEGIN
     CONTROL         "List1",IDC_LIST2,"SysListView32",LVS_REPORT | LVS_SORTASCENDING | NOT WS_VISIBLE | WS_BORDER | WS_TABSTOP,7,21,276,298
 END
 
-IDD_Cheats_DumpMemory DIALOG  0, 0, 211, 129
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_Cheats_DumpMemory DIALOGEX 0, 0, 211, 129
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Dump Memory"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX        "Range",IDC_STATIC,7,3,197,61
     LTEXT           "&Start VAddress",IDC_STATIC,13,16,61,10
@@ -494,10 +495,10 @@ BEGIN
     PUSHBUTTON      "Close",IDCANCEL,154,110,50,14
 END
 
-IDD_Lang_Select DIALOG  0, 0, 237, 111
-STYLE DS_SETFONT | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+IDD_Lang_Select DIALOGEX 0, 0, 237, 111
+STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Welcome to"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,90,99,50,12
     LTEXT           "Select Language:",IDC_SELECT_LANG,12,77,86,12
@@ -505,9 +506,9 @@ BEGIN
 END
 
 IDD_Debugger_Memory DIALOGEX 0, 0, 446, 194
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Memory"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     EDITTEXT        IDC_ADDR_EDIT,38,13,66,12
     LTEXT           "Address:",IDC_STATIC,7,14,29,11
@@ -521,10 +522,10 @@ BEGIN
     CONTROL         "Mem Details",IDC_MEM_DETAILS,"ListCtrl",WS_TABSTOP,7,31,416,154
 END
 
-IDD_Debugger_Search DIALOG  0, 0, 229, 233
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_Debugger_Search DIALOGEX 0, 0, 229, 233
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Search Memory"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX        "Search Location:",IDC_STATIC,7,3,215,44
     LTEXT           "PAddr Start: ",IDC_STATIC,13,15,41,9
@@ -555,10 +556,10 @@ BEGIN
     CONTROL         "List1",IDC_LST_RESULTS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,13,153,202,65
 END
 
-IDD_About_UserInfo DIALOG  0, 0, 186, 97
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_About_UserInfo DIALOGEX 0, 0, 186, 97
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Dialog"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,61,76,50,14
     GROUPBOX        "Static",IDC_STATIC,7,3,172,68
@@ -570,14 +571,14 @@ BEGIN
     EDITTEXT        IDC_INFO3,69,51,104,15,ES_AUTOHSCROLL | ES_READONLY
 END
 
-IDD_Settings_Config DIALOG  0, 0, 357, 207
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_Settings_Config DIALOGEX 0, 0, 357, 207
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Dialog"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,194,186,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,248,186,50,14
-    CONTROL         "Tree1",IDC_PAGELIST,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,8,7,116,169
+    CONTROL         "Tree1",IDC_PAGELIST,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,8,7,116,169
     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,7,180,343,1
     PUSHBUTTON      "Reset Page",IDC_RESET_PAGE,7,186,50,14,WS_DISABLED
     CONTROL         "",IDC_SETTING_INFO,"Static",SS_ETCHEDFRAME,131,7,219,170
@@ -586,7 +587,7 @@ BEGIN
 END
 
 IDD_Settings_GameRecompiler DIALOGEX 0, 0, 230, 156
-STYLE DS_SETFONT | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -608,7 +609,7 @@ BEGIN
 END
 
 IDD_Settings_GamePlugin DIALOGEX 0, 0, 231, 206
-STYLE DS_SETFONT | DS_CENTER | WS_CHILD | WS_VISIBLE
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD | WS_VISIBLE
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -629,7 +630,7 @@ BEGIN
 END
 
 IDD_Settings_GameStatus DIALOGEX 0, 0, 218, 158
-STYLE DS_SETFONT | WS_CHILD
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -648,7 +649,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_Settings_PlugSel, DIALOG
     BEGIN
@@ -827,6 +828,10 @@ BEGIN
         BOTTOMMARGIN, 107
     END
 
+    IDD_Debugger_Memory, DIALOG
+    BEGIN
+    END
+
     IDD_Debugger_Search, DIALOG
     BEGIN
         LEFTMARGIN, 7
@@ -897,7 +902,7 @@ IDB_LANG_OK_DOWN        BITMAP                  "Bitmaps\\LangOK_down.bmp"
 // Menu
 //
 
-IDR_POPUP MENU 
+IDR_POPUP MENU
 BEGIN
     POPUP "PopupMenu"
     BEGIN
@@ -914,7 +919,7 @@ BEGIN
     END
 END
 
-IDR_CHEAT_MENU MENU 
+IDR_CHEAT_MENU MENU
 BEGIN
     POPUP "Popup"
     BEGIN
@@ -925,7 +930,7 @@ BEGIN
     END
 END
 
-IDR_MEM_SEARCH MENU 
+IDR_MEM_SEARCH MENU
 BEGIN
     POPUP "Popup"
     BEGIN