From 4eaee03f7919d114a2a5c13e26a802768dad524a Mon Sep 17 00:00:00 2001 From: stephena Date: Wed, 17 Jan 2007 13:17:42 +0000 Subject: [PATCH] Got rid of a few FIXME's that became redundant. Bumped version # to 2.3.5. I'll be doing a new release either tonight or tomorrow. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1286 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/src/common/Version.hxx | 4 ++-- stella/src/gui/InputDialog.cxx | 5 +---- stella/src/gui/OptionsDialog.cxx | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/stella/src/common/Version.hxx b/stella/src/common/Version.hxx index 84f418566..49a61a8bc 100644 --- a/stella/src/common/Version.hxx +++ b/stella/src/common/Version.hxx @@ -13,13 +13,13 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Version.hxx,v 1.24 2007-01-10 20:29:10 stephena Exp $ +// $Id: Version.hxx,v 1.25 2007-01-17 13:17:42 stephena Exp $ //============================================================================ #ifndef VERSION_HXX #define VERSION_HXX -#define STELLA_BASE_VERSION "2.3.03" +#define STELLA_BASE_VERSION "2.3.5" #ifdef NIGHTLY_BUILD #define STELLA_VERSION STELLA_BASE_VERSION "pre-" NIGHTLY_BUILD diff --git a/stella/src/gui/InputDialog.cxx b/stella/src/gui/InputDialog.cxx index 878f876ea..b72dc0fb1 100644 --- a/stella/src/gui/InputDialog.cxx +++ b/stella/src/gui/InputDialog.cxx @@ -13,12 +13,9 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: InputDialog.cxx,v 1.22 2007-01-01 18:04:53 stephena Exp $ +// $Id: InputDialog.cxx,v 1.23 2007-01-17 13:17:42 stephena Exp $ //============================================================================ -// FIXME - this whole dialog should be a dialog of buttons instead of -// a tabwidget. It would make things sooo much easier. - #include "OSystem.hxx" #include "Widget.hxx" #include "Array.hxx" diff --git a/stella/src/gui/OptionsDialog.cxx b/stella/src/gui/OptionsDialog.cxx index e96100b23..56e867d93 100644 --- a/stella/src/gui/OptionsDialog.cxx +++ b/stella/src/gui/OptionsDialog.cxx @@ -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: OptionsDialog.cxx,v 1.48 2007-01-01 18:04:53 stephena Exp $ +// $Id: OptionsDialog.cxx,v 1.49 2007-01-17 13:17:42 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -58,7 +58,7 @@ OptionsDialog::OptionsDialog(OSystem* osystem, DialogContainer* parent, myAboutDialog(NULL), myIsGlobal(global) { - const GUI::Font& font = instance()->font(); // FIXME - change reference to optionsFont() + const GUI::Font& font = instance()->font(); int xoffset = 10, yoffset = 10; WidgetArray wid; ButtonWidget* b = NULL;