From 5b54bd4afb8bda72b40ec3b6c6c6d87f56b101bf Mon Sep 17 00:00:00 2001 From: dinkc64 Date: Fri, 2 Aug 2019 22:14:36 -0400 Subject: [PATCH] dont use segoe --- makefile | 7 +- makefile.mamemingw | 8 -- makefile.mingw | 8 -- src/burner/win32/about.cpp | 4 - src/burner/win32/app.rc | 140 ---------------------------------- src/burner/win32/gameinfo.cpp | 4 - 6 files changed, 1 insertion(+), 170 deletions(-) diff --git a/makefile b/makefile index 89e74ecf1..280bc5f2e 100644 --- a/makefile +++ b/makefile @@ -18,11 +18,6 @@ export # Include Unicode support UNICODE = 1 -# Use Segoe Fonts (installed by default on Windows Vista and newer), unless we are doing a winxp build -ifndef XPBUILD -USE_SEGOE = 1 -endif - # Build A68K ASM 68000 core #BUILD_A68K = 1 @@ -47,7 +42,7 @@ INCLUDE_AVI_RECORDING = 1 # Include features for debugging drivers unless we are doing a release build ifndef RELEASEBUILD DEBUG = 1 -endif +endif # Include rom set verifying features (comment this for release builds) #ROM_VERIFY = 1 diff --git a/makefile.mamemingw b/makefile.mamemingw index 85a5a3e95..96e2d9d5c 100644 --- a/makefile.mamemingw +++ b/makefile.mamemingw @@ -243,10 +243,6 @@ ifdef BUILD_X64_EXE DEF := $(DEF) -DBUILD_X64_EXE -DXBYAK_NO_OP_NAMES -DMIPS3_X64_DRC endif -ifdef USE_SEGOE - DEF := $(DEF) -DUSE_SEGOE -endif - ifdef SYMBOL CFLAGS += -ggdb3 @@ -400,11 +396,7 @@ resource.o resource.d: $(app_gnuc.rc) string.rc version.rc version.h $(build_det $(license.rtf): $(srcdir)license.txt $(srcdir)dep/scripts/license2rtf.pl ifdef PERL -ifdef USE_SEGOE - @$(srcdir)dep/scripts/license2rtf.pl $< -o $(srcdir)dep/generated/$(@F:.rc=.rtf) -f 'Segoe UI' -else @$(srcdir)dep/scripts/license2rtf.pl $< -o $(srcdir)dep/generated/$(@F:.rc=.rtf) -endif else ifeq ($(MAKELEVEL),2) @echo diff --git a/makefile.mingw b/makefile.mingw index 997acb65e..02dd56a02 100644 --- a/makefile.mingw +++ b/makefile.mingw @@ -355,10 +355,6 @@ ifdef BUILD_X64_EXE DEF := $(DEF) -DBUILD_X64_EXE -DXBYAK_NO_OP_NAMES -DMIPS3_X64_DRC endif -ifdef USE_SEGOE - DEF := $(DEF) -DUSE_SEGOE -endif - ifdef SYMBOL CFLAGS += -ggdb3 @@ -532,11 +528,7 @@ resource.o resource.d: $(app_gnuc.rc) string.rc version.rc version.h $(build_det $(license.rtf): $(srcdir)license.txt $(srcdir)dep/scripts/license2rtf.pl ifdef PERL -ifdef USE_SEGOE - @$(srcdir)dep/scripts/license2rtf.pl $< -o $(srcdir)dep/generated/$(@F:.rc=.rtf) -f 'Segoe UI' -else @$(srcdir)dep/scripts/license2rtf.pl $< -o $(srcdir)dep/generated/$(@F:.rc=.rtf) -endif else ifeq ($(MAKELEVEL),2) @echo diff --git a/src/burner/win32/about.cpp b/src/burner/win32/about.cpp index 21d408a02..cc440225a 100644 --- a/src/burner/win32/about.cpp +++ b/src/burner/win32/about.cpp @@ -11,10 +11,6 @@ static void myDrawText(HDC hDC, RECT* pRect, TCHAR* szText, int nSizeDelta, int HFONT hFont, myFont; TEXTMETRIC myMetric; -#ifdef USE_SEGOE - nSizeDelta += 2; -#endif - GetTextFace(hDC, 32, szName); GetTextMetrics(hDC, &myMetric); myFont = CreateFont(myMetric.tmHeight + nSizeDelta, 0, 0, 0, FW_BLACK, 0, 0, 0, 0, 0, 0, ANTIALIASED_QUALITY, 0, szName); diff --git a/src/burner/win32/app.rc b/src/burner/win32/app.rc index 59f2ff638..1ba2d7a77 100644 --- a/src/burner/win32/app.rc +++ b/src/burner/win32/app.rc @@ -54,11 +54,7 @@ END IDD_SPLASH DIALOGEX 0, 0, 206, 141 STYLE DS_MODALFRAME | DS_CENTER | DS_FIXEDSYS | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN CONTROL BMP_SPLASH,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,1,1,9999,9999 END @@ -66,11 +62,7 @@ END IDD_INPD DIALOGEX 0, 0, 283, 244 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Map Game Inputs" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN DEFPUSHBUTTON "OK",IDCANCEL,228,225,50,14 GROUPBOX "", IDC_STATIC, 3, 0, 277, 220 @@ -91,11 +83,7 @@ END IDD_INPS DIALOGEX 0, 0, 195, 64 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select control" -#ifdef USE_SEGOE -FONT 8, "Segoe UI" -#else FONT 8, "MS Shell Dlg" -#endif BEGIN CONTROL "Grab mouse",IDC_INPS_GRABMOUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,5,50,10 PUSHBUTTON "Activate",IDC_INPS_PUSH,5,15,50,11 @@ -109,11 +97,7 @@ END IDD_INPC DIALOGEX 0, 0, 97, 26 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Edit Constant" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN EDITTEXT IDC_INPC_VALUE,5,5,40,15,ES_AUTOHSCROLL PUSHBUTTON "Close",IDCANCEL,50,5,40,15 @@ -122,11 +106,7 @@ END IDD_INPCHEAT DIALOGEX 0, 0, 250, 200 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit cheat settings" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN GROUPBOX "", IDC_STATIC, 3, 0, 244, 176 CTEXT "Select a cheat to change it.", IDC_STATIC, 7, 7, 232, 15, SS_CENTERIMAGE @@ -140,11 +120,7 @@ END IDD_INPDIP DIALOGEX 0, 0, 270, 200 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit DIPswitch settings" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN GROUPBOX "", IDC_STATIC, 3, 0, 264, 176 CTEXT "Select a setting to change it.", IDC_STATIC, 7, 7, @@ -158,11 +134,7 @@ END IDD_VALUE DIALOGEX DISCARDABLE 0, 0, 140, 20 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -#ifdef USE_SEGOE -FONT 8, "Segoe UI" -#else FONT 8, "MS Shell Dlg" -#endif BEGIN DEFPUSHBUTTON "Close",ID_VALUE_CLOSE,86,3,50,13 EDITTEXT IDC_VALUE_EDIT,4,3,78,12,ES_AUTOHSCROLL | ES_NUMBER @@ -171,11 +143,7 @@ END IDD_WAIT DIALOGEX 0, 0, 206, 42 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN CONTROL BMP_MISC,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,2,2,9999,9999 CONTROL "Progress1",IDC_WAIT_PROG,"msctls_progress32",PBS_SMOOTH | WS_BORDER,62,5,139,11 @@ -188,11 +156,7 @@ END IDD_ROMSDIR DIALOGEX 0, 0, 242, 81 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit ROMs paths" -#ifdef USE_SEGOE -FONT 8, "Segoe UI" -#else FONT 8, "MS Shell Dlg" -#endif BEGIN CONTROL "Tab2",IDC_ROMPATH_TAB,"SysTabControl32",WS_TABSTOP,9,6,224,48 DEFPUSHBUTTON "OK",IDOK,183,57,50,14 @@ -243,11 +207,7 @@ END IDD_ABOUT DIALOGEX 0, 0, 360, 109 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW -#ifdef USE_SEGOE -FONT 8, "Segoe UI" -#else FONT 8, "MS Shell Dlg" -#endif BEGIN CONTROL BMP_ABOUT,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,3,3,100,50 CONTROL "version",IDC_FBA_VER,"Static",SS_OWNERDRAW | WS_GROUP,83,65,269,10 @@ -261,11 +221,7 @@ END IDD_FIRST DIALOGEX 0, 0, 360, 191 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW -#ifdef USE_SEGOE -FONT 8, "Segoe UI" -#else FONT 8, "MS Shell Dlg" -#endif BEGIN CONTROL BMP_ABOUT,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,3,3,100,50 CONTROL "version",IDC_FBA_VER,"Static",SS_OWNERDRAW | WS_GROUP,83,65,269,10 @@ -278,11 +234,7 @@ END IDD_SELNEW DIALOGEX 0, 0, 500, 362 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Select Game" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN CONTROL "Tree1",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_LINESATROOT | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | TVS_NOHSCROLL | WS_TABSTOP,9,133,323,137,WS_EX_STATICEDGE CONTROL "Tree2",IDC_TREE2,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_TABSTOP | 0x8000,345,101,148,168,WS_EX_STATICEDGE @@ -329,11 +281,7 @@ END IDD_CAPTURE DIALOGEX 0, 0, 270, 90 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Shots Factory" -#ifdef USE_SEGOE -FONT 8, "Segoe UI" -#else FONT 8, "MS Shell Dlg" -#endif BEGIN DEFPUSHBUTTON "&Capture",IDCAPTURE,125,72,70,14 PUSHBUTTON "OK",IDOK,197,72,70,14 @@ -356,11 +304,7 @@ END IDD_GAMMA DIALOGEX 0, 0, 214, 59 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select desired Gamma value" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN DEFPUSHBUTTON "OK",IDOK,159,40,50,14 GROUPBOX "", IDC_STATIC, 3, 0, 208, 35 @@ -372,11 +316,7 @@ END IDD_SCANLINE DIALOGEX 0, 0, 214, 59 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select desired scanline intensity" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN DEFPUSHBUTTON "OK",IDOK,159,40,50,14 GROUPBOX "", IDC_STATIC, 3, 0, 208, 35 @@ -388,11 +328,7 @@ END IDD_PHOSPHOR DIALOGEX 0, 0, 214, 82 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select desired feedback intensity" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN DEFPUSHBUTTON "OK",IDOK,159,63,50,14 GROUPBOX "", IDC_STATIC, 3, 0, 208, 58 @@ -407,11 +343,7 @@ END IDD_SCREENANGLE DIALOGEX 0, 0, 234, 82 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select desired 3D projection properties" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN DEFPUSHBUTTON "OK",IDOK,179,63,50,14 GROUPBOX "", IDC_STATIC, 3, 0, 228, 58 @@ -427,11 +359,7 @@ END IDD_CHOOSERES DIALOGEX 0, 0, 134, 54 STYLE DS_MODALFRAME | DS_CENTER | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select desired resolution" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN DEFPUSHBUTTON "OK", IDOK, 79, 35, 50, 14 GROUPBOX "", IDC_STATIC, 3, 0, 128, 30 @@ -443,11 +371,7 @@ END IDD_CPUCLOCK DIALOGEX 0, 0, 222, 59 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Adjust speed of the emulated CPU" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN DEFPUSHBUTTON "OK",IDOK,167,40,50,14 GROUPBOX "", IDC_STATIC, 3, 0, 216, 35 @@ -460,11 +384,7 @@ END IDD_EXCEPTION DIALOGEX 0, 0, 349, 69 STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "FB Neo has encountered an unrecoverable problem and will be terminated" -#ifdef USE_SEGOE -FONT 8, "Segoe UI" -#else FONT 8, "MS Shell Dlg" -#endif BEGIN CONTROL "", IDC_SYSINFO_CODE, "Static", SS_SUNKEN | SS_CENTER | SS_CENTERIMAGE, 3,3,342,40, WS_EX_STATICEDGE DEFPUSHBUTTON "OK",IDOK,294,49,50,14 @@ -477,11 +397,7 @@ END IDD_SYSINFO DIALOGEX 0, 0, 349, 151 STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "FB Neo system information report" -#ifdef USE_SEGOE -FONT 8, "Segoe UI" -#else FONT 8, "MS Shell Dlg" -#endif BEGIN DEFPUSHBUTTON "OK",IDOK,274,131,70,14 PUSHBUTTON "Save...",IDC_SYSINFO_LOG_SAVE,200,131,70,14 @@ -491,11 +407,7 @@ END IDD_DEBUG_LRG DIALOGEX 0, 0, 582, 442 STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "FB Neo debugger" -#ifdef USE_SEGOE -FONT 8, "Segoe UI" -#else FONT 8, "MS Shell Dlg" -#endif BEGIN CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,3,399,523,14,WS_EX_STATICEDGE CONTROL "",IDC_DBG_COMMAND,"RICHEDIT20A",ES_LOWERCASE | ES_AUTOHSCROLL | ES_NOIME | WS_TABSTOP,4,400,521,12, ES_EX_NOCALLOLEINIT @@ -533,11 +445,7 @@ IDD_DEBUG_SML DIALOGEX 0, 0, 592, 356 STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW CAPTION "FB Neo debugger" -#ifdef USE_SEGOE -FONT 6, "Segoe UI" -#else FONT 6, "MS Shell Dlg" -#endif BEGIN CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,3,313,532,14,WS_EX_STATICEDGE CONTROL "",IDC_DBG_COMMAND,"RICHEDIT20A",ES_LOWERCASE | ES_AUTOHSCROLL | ES_NOIME | WS_TABSTOP,4,314,530,12, ES_EX_NOCALLOLEINIT @@ -564,11 +472,7 @@ END IDD_POPUP DIALOGEX 0, 0, 45, 36 STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "FB Neo message" -#ifdef USE_SEGOE -FONT 8, "Segoe UI" -#else FONT 8, "MS Shell Dlg" -#endif BEGIN DEFPUSHBUTTON "OK",IDOK,38,16,50,14 CONTROL "",IDC_MESSAGE_BACK,"Static",SS_WHITERECT | NOT WS_VISIBLE,0,0,0,0 @@ -580,11 +484,7 @@ END IDD_SUPPORTDIR DIALOGEX 0, 0, 242, 81 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit support file paths" -#ifdef USE_SEGOE -FONT 8, "Segoe UI" -#else FONT 8, "MS Shell Dlg" -#endif BEGIN CONTROL "Tab2",IDC_SPATH_TAB,"SysTabControl32",WS_TABSTOP,9,6,224,48 DEFPUSHBUTTON "OK",IDOK,183,57,50,14 @@ -643,11 +543,7 @@ END IDD_PALETTEVIEWER DIALOGEX 0, 0, 320, 240 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Palette Viewer" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN CONTROL "00000",IDC_GFX_VIEWER_VERT_1,"Static",SS_RIGHT,1,15,22,8 CONTROL "00010",IDC_GFX_VIEWER_VERT_2,"Static",SS_RIGHT,1,28,22,8 @@ -690,11 +586,7 @@ END IDD_IPS_MANAGER DIALOGEX 0, 0, 474, 318 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "IPS Patch Manager" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN CONTROL "Tree1",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_TABSTOP | 0x8000,8,10,250,150,WS_EX_STATICEDGE GROUPBOX "",IDC_STATIC1,2,0,470,298 @@ -711,11 +603,7 @@ END IDD_MVS_SELECT_CARTS DIALOGEX 0, 0, 369, 271 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select cartridges to load..." -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN GROUPBOX "", IDC_STATIC, 3, 0, 362, 247 @@ -774,11 +662,7 @@ END IDD_NCD_DLG DIALOGEX 0, 0, 520, 291 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "NeoGeo CDZ Game List" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 400, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 400, 0, 0x1 -#endif BEGIN CONTROL "",IDC_NCD_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,5,348,218 DEFPUSHBUTTON "Play",IDC_NCD_PLAY_BUTTON,445,272,71,14 @@ -820,11 +704,7 @@ IDD_NCD_COVER_DLG DIALOGEX 0, 0, 397, 262 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW CAPTION "Cover Image" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 400, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 400, 0, 0x1 -#endif BEGIN CONTROL "",IDC_NCD_COVER_PREVIEW_PIC,"Static",SS_BITMAP,3,2,312,179,WS_EX_CLIENTEDGE END @@ -832,11 +712,7 @@ END IDD_GAMEINFO DIALOGEX 0, 0, 520, 369 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Game Information" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN CONTROL "Tab1",IDC_TAB1,"SysTabControl32",TCS_SINGLELINE | WS_TABSTOP,4,76,512,270 CONTROL "",IDC_STATIC_INFOBOX,"Static",SS_WHITERECT | SS_SUNKEN,4,4,512,66 @@ -866,11 +742,7 @@ END IDD_DOWNLOAD_LOCAL DIALOGEX 0, 0, 168, 48 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Download Localisation Template" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN GROUPBOX "",IDC_STATIC1,2,0,164,28 LTEXT "Language:", IDC_LOCAL_DOWNLOAD_LANG, 8, 10, 40, 10, SS_CENTERIMAGE @@ -882,11 +754,7 @@ END IDD_REPLAYINP DIALOGEX 0, 0, 276, 137 STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Replay input" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN DEFPUSHBUTTON "OK",IDOK,219,120,50,14 GROUPBOX "",IDC_STATIC,3,0,269,115 @@ -915,11 +783,7 @@ END IDD_RECORDINP DIALOGEX 0, 0, 276, 98 STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Record input" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN DEFPUSHBUTTON "OK",IDOK,219,79,50,14 GROUPBOX "",-1,3,0,269,73 @@ -935,11 +799,7 @@ END IDD_CHOOSEMONITOR DIALOGEX 0, 0, 242, 77 STYLE DS_MODALFRAME | DS_CENTER | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Choose Monitor for Full Screen" -#ifdef USE_SEGOE -FONT 8, "Segoe UI", 0, 0, 0x1 -#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 -#endif BEGIN GROUPBOX "",IDC_STATIC1,2,0,236,56 LTEXT "These only apply to the DirectX Graphics 9 blitters.",IDC_CHOOSE_MONITOR_TEXT,8,4,210,15,SS_CENTERIMAGE diff --git a/src/burner/win32/gameinfo.cpp b/src/burner/win32/gameinfo.cpp index 3f528c7e6..e395da84f 100644 --- a/src/burner/win32/gameinfo.cpp +++ b/src/burner/win32/gameinfo.cpp @@ -571,11 +571,7 @@ static int GameInfoInit() char Temp[10000]; int inGame = 0; -#ifdef USE_SEGOE TCHAR szBuffer[50000] = _T("{\\rtf1\\ansi{\\fonttbl(\\f0\\fnil\\fcharset0 Verdana;)}{\\colortbl;\\red220\\green0\\blue0;\\red0\\green0\\blue0;}"); -#else - TCHAR szBuffer[50000] = _T("{\\rtf1\\ansi{\\fonttbl(\\f0\\fnil\\fcharset0 Segoe UI;)}{\\colortbl;\\red220\\green0\\blue0;\\red0\\green0\\blue0;}"); -#endif if (fp) { while (!feof(fp)) {