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

Made Stella compile again in MingW. It was apparently a problem with namespaces. 

It seems parts of Stella aren't namespace-clean.

Fixed OSX code to use Cmd-Enter for fullscreen (instead of Shift-Cmd Enter).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@458 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2005-06-02 21:37:33 +00:00
parent 57246c69a9
commit b4de09b4f8
7 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
stella/src/emucore/EventHandler.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: EventHandler.cxx,v 1.67 2005-05-28 23:57:10 stephena Exp $
// $Id: EventHandler.cxx,v 1.68 2005-06-02 21:37:33 stephena Exp $
//============================================================================
#include <algorithm>
@ -265,10 +265,11 @@ void EventHandler::poll(uInt32 time)
myOSystem->frameBuffer().resize(PreviousSize);
break;
case SDLK_RETURN:
#ifndef MAC_OSX
case SDLK_RETURN:
myOSystem->frameBuffer().toggleFullscreen();
break;
#endif
case SDLK_f:
myOSystem->frameBuffer().toggleFilter();
break;
@ -296,8 +297,11 @@ void EventHandler::poll(uInt32 time)
case SDLK_SLASH:
handleMacOSXKeypress(int(key));
break;
#endif
case SDLK_RETURN:
myOSystem->frameBuffer().toggleFullscreen();
break;
#endif
case SDLK_g:
// don't change grabmouse in fullscreen mode
if(!myOSystem->frameBuffer().fullScreen())

4
stella/src/emucore/FSNode.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: FSNode.hxx,v 1.5 2005-05-26 18:56:57 stephena Exp $
// $Id: FSNode.hxx,v 1.6 2005-06-02 21:37:33 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -61,7 +61,7 @@ class FilesystemNode;
/**
* List of multiple file system nodes. E.g. the contents of a given directory.
*/
class FSList : public Array<FilesystemNode>
class FSList : public GUI::Array<FilesystemNode>
{
public:
void sort();

6
stella/src/gui/Array.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: Array.hxx,v 1.3 2005-05-13 01:03:27 stephena Exp $
// $Id: Array.hxx,v 1.4 2005-06-02 21:37:33 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -26,6 +26,8 @@
#include "bspf.hxx"
namespace GUI {
template <class T>
class Array
{
@ -188,4 +190,6 @@ class Array
}
};
} // Namespace GUI
#endif

4
stella/src/gui/GameList.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: GameList.hxx,v 1.3 2005-05-13 18:28:05 stephena Exp $
// $Id: GameList.hxx,v 1.4 2005-06-02 21:37:33 stephena Exp $
//
// Based on code from KStella - Stella frontend
// Copyright (C) 2003-2005 Stephen Anthony
@ -37,7 +37,7 @@ class GameList
string _note;
};
typedef Array<Entry> EntryList;
typedef GUI::Array<Entry> EntryList;
EntryList myArray;

8
stella/src/gui/PopUpWidget.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: PopUpWidget.hxx,v 1.5 2005-05-14 03:26:29 stephena Exp $
// $Id: PopUpWidget.hxx,v 1.6 2005-06-02 21:37:33 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -50,13 +50,13 @@ class PopUpWidget : public Widget, public CommandSender
int tag;
};
typedef Array<Entry> EntryList;
typedef GUI::Array<Entry> EntryList;
protected:
EntryList _entries;
int _selectedItem;
int _selectedItem;
string _label;
int _labelWidth;
int _labelWidth;
public:
PopUpWidget(GuiObject* boss, int x, int y, int w, int h,

4
stella/src/gui/StringList.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: StringList.hxx,v 1.1 2005-04-04 02:19:22 stephena Exp $
// $Id: StringList.hxx,v 1.2 2005-06-02 21:37:33 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -26,7 +26,7 @@
#include "bspf.hxx"
class StringList : public Array<string>
class StringList : public GUI::Array<string>
{
public:
void push_back(const char *str)

8
stella/src/gui/TabWidget.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: TabWidget.hxx,v 1.2 2005-05-13 18:28:06 stephena Exp $
// $Id: TabWidget.hxx,v 1.3 2005-06-02 21:37:33 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -34,7 +34,7 @@ class TabWidget : public Widget, public CommandSender
string title;
Widget* firstWidget;
};
typedef Array<Tab> TabList;
typedef GUI::Array<Tab> TabList;
public:
TabWidget(GuiObject *boss, int x, int y, int w, int h);
@ -65,9 +65,9 @@ class TabWidget : public Widget, public CommandSender
virtual Widget *findWidget(int x, int y);
protected:
int _activeTab;
int _activeTab;
TabList _tabs;
int _tabWidth;
int _tabWidth;
private:
void box(int x, int y, int width, int height,