From 528689144151d2f4a2363f16e051993ac09adfaa Mon Sep 17 00:00:00 2001 From: Bl0ckeduser Date: Sun, 13 Nov 2011 13:07:34 -0500 Subject: [PATCH 1/3] Fix missing header (ctype.h for isalnum) --- controls.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/controls.cpp b/controls.cpp index 08aa3e8e..224ec88a 100644 --- a/controls.cpp +++ b/controls.cpp @@ -182,6 +182,7 @@ #include #include #include +#include #include "snes9x.h" #include "memmap.h" From d98ed475eb975e8d915c0d511b3de8a5f3bbcccd Mon Sep 17 00:00:00 2001 From: bl0ckeduser Date: Mon, 14 Nov 2011 20:10:15 -0500 Subject: [PATCH 2/3] Win32: fix about dialog text layout --- win32/wlanguage.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/win32/wlanguage.h b/win32/wlanguage.h index e50402dd..05e9cf7a 100644 --- a/win32/wlanguage.h +++ b/win32/wlanguage.h @@ -187,21 +187,21 @@ //#define REG_KEY_VER "1.31" #define DISCLAIMER_TEXT TEXT("Snes9X v%s for Windows.\r\n\ - (c) Copyright 1996 - 2002 Gary Henderson and Jerremy Koot (jkoot@snes9x.com)\r\n\ - (c) Copyright 2002 - 2004 Matthew Kendora\r\n\ - (c) Copyright 2002 - 2005 Peter Bortas\r\n\ - (c) Copyright 2004 - 2005 Joel Yliluoma\r\n\ - (c) Copyright 2001 - 2006 John Weidman\r\n\ - (c) Copyright 2002 - 2010 Brad Jorsch, funkyass, Kris Bleakley, Nach, zones\r\n\ - (c) Copyright 2006 - 2007 nitsuja\r\n\ - (c) Copyright 2009 - 2011 BearOso, OV2\r\n\r\n\ - Windows Port Authors: Matthew Kendora, funkyass, nitsuja, Nach, blip, OV2.\r\n\r\n\ - Snes9X is a Super Nintendo Entertainment System\r\n\ - emulator that allows you to play most games designed\r\n\ - for the SNES on your PC.\r\n\r\n\ - Please visit http://www.snes9x.com for\r\n\ - up-to-the-minute information and help on Snes9X.\r\n\r\n\ - Nintendo is a trade mark.") +(c) Copyright 1996 - 2002 Gary Henderson and Jerremy Koot (jkoot@snes9x.com)\r\n\ +(c) Copyright 2002 - 2004 Matthew Kendora\r\n\ +(c) Copyright 2002 - 2005 Peter Bortas\r\n\ +(c) Copyright 2004 - 2005 Joel Yliluoma\r\n\ +(c) Copyright 2001 - 2006 John Weidman\r\n\ +(c) Copyright 2002 - 2010 Brad Jorsch, funkyass, Kris Bleakley, Nach, zones\r\n\ +(c) Copyright 2006 - 2007 nitsuja\r\n\ +(c) Copyright 2009 - 2011 BearOso, OV2\r\n\r\n\ +Windows Port Authors: Matthew Kendora, funkyass, nitsuja, Nach, blip, OV2.\r\n\r\n\ +Snes9X is a Super Nintendo Entertainment System\r\n\ +emulator that allows you to play most games designed\r\n\ +for the SNES on your PC.\r\n\r\n\ +Please visit http://www.snes9x.com for\r\n\ +up-to-the-minute information and help on Snes9X.\r\n\r\n\ +Nintendo is a trade mark.") #define APP_NAME TEXT("Snes9x") From f35b8005d582acadbe13c5159e85bf093c9439a2 Mon Sep 17 00:00:00 2001 From: bl0ckeduser Date: Mon, 14 Nov 2011 20:11:10 -0500 Subject: [PATCH 3/3] Win32: add scrollbar to accomodate large about dialog text --- win32/rsrc/snes9x.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32/rsrc/snes9x.rc b/win32/rsrc/snes9x.rc index aad02cb6..e5e1b992 100644 --- a/win32/rsrc/snes9x.rc +++ b/win32/rsrc/snes9x.rc @@ -96,7 +96,7 @@ CAPTION "APP - About Dialog" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,90,160,50,14 - EDITTEXT IDC_DISCLAIMER,7,7,218,148,ES_MULTILINE | ES_NOHIDESEL | ES_READONLY,WS_EX_STATICEDGE + EDITTEXT IDC_DISCLAIMER,7,7,218,148,ES_MULTILINE | ES_NOHIDESEL | WS_VSCROLL | ES_READONLY,WS_EX_STATICEDGE END IDD_EMU_SETTINGS DIALOGEX 0, 0, 319, 154