ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from bl0ckeduser/master 

Fix mising header file; fix Windows "about" dialog
This commit is contained in:
OV2 2011-11-15 15:55:44 -08:00
parent a5176752fd f35b8005d5
commit 3086eb6901
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
controls.cpp
View File

@ -182,6 +182,7 @@
#include <string>
#include <algorithm>
#include <assert.h>
#include <ctype.h>
#include "snes9x.h"
#include "memmap.h"

2
win32/rsrc/snes9x.rc
View File

@ -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

30
win32/wlanguage.h
View File

@ -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")