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

Moved the Scrollbar init stuff to EventHandler, since it makes more sense 

to have it there.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1348 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2007-08-15 19:14:49 +00:00
parent 037d675f60
commit 3b628e534d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,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.205 2007-08-13 19:45:42 stephena Exp $
// $Id: EventHandler.cxx,v 1.206 2007-08-15 19:14:49 stephena Exp $
//============================================================================
#include <sstream>
@ -39,6 +39,7 @@
#include "Serializer.hxx"
#include "PropsSet.hxx"
#include "Snapshot.hxx"
#include "ScrollBarWidget.hxx"
#include "bspf.hxx"
#ifdef CHEATCODE_SUPPORT
@ -155,6 +156,9 @@ void EventHandler::initialize()
myGrabMouseFlag = myOSystem->settings().getBool("grabmouse");
setPaddleMode(myOSystem->settings().getInt("paddle"), false);
setPaddleThreshold(myOSystem->settings().getInt("pthresh"));
// Set number of lines a mousewheel will scroll
ScrollBarWidget::setWheelLines(myOSystem->settings().getInt("mwheel"));
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

6
stella/src/emucore/OSystem.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: OSystem.cxx,v 1.106 2007-08-15 17:43:51 stephena Exp $
// $Id: OSystem.cxx,v 1.107 2007-08-15 19:14:49 stephena Exp $
//============================================================================
#include <cassert>
@ -46,7 +46,6 @@
#include "bspf.hxx"
#include "OSystem.hxx"
#include "Widget.hxx"
#include "ScrollBarWidget.hxx"
#define MAX_ROM_SIZE 512 * 1024
@ -184,9 +183,6 @@ bool OSystem::create()
myDebugger = new Debugger(this);
#endif
// Set number of lines a mousewheel will scroll
ScrollBarWidget::setWheelLines(mySettings->getInt("mwheel"));
// Create the sound object; the sound subsystem isn't actually
// opened until needed, so this is non-blocking (on those systems
// that only have a single sound device (no hardware mixing)