[Scummvm-cvs-logs] CVS: scummvm/gui console.cpp,1.66,1.67 options.cpp,1.96,1.97

[Chris Apers]

Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17657

Modified Files:
	console.cpp options.cpp 
Log Message:
Fixed line endings

Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/console.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- console.cpp	3 Sep 2005 16:21:57 -0000	1.66
+++ console.cpp	3 Sep 2005 18:20:09 -0000	1.67
@@ -1,656 +1,656 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2005 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
[...1281 lines suppressed...]
+		g_gui.fillRect(x, y, kConsoleCharWidth, kConsoleLineHeight, g_gui._textcolor);
+		g_gui.drawChar(c, x, y + 2, g_gui._bgcolor, &g_consolefont);
+	}
+	g_gui.addDirtyRect(x, y, kConsoleCharWidth, kConsoleLineHeight);
+
+	_caretVisible = !erase;
+}
+
+void ConsoleDialog::scrollToCurrent() {
+	int line = _promptEndPos / _lineWidth;
+
+	if (line + _linesPerPage <= _scrollLine) {
+		// TODO - this should only occur for loong edit lines, though
+	} else if (line > _scrollLine) {
+		_scrollLine = line;
+		updateScrollBuffer();
+	}
+}
+
+} // End of namespace GUI

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- options.cpp	3 Sep 2005 16:24:58 -0000	1.96
+++ options.cpp	3 Sep 2005 18:20:09 -0000	1.97
@@ -1,679 +1,679 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2005 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
[...1327 lines suppressed...]
+		BrowserDialog browser("Select SoundFont", false);
+		if (browser.runModal() > 0) {
+			// User made his choice...
+			FilesystemNode file(browser.getResult());
+			_soundFont->setLabel(file.path());
+			draw();
+		}
+		break;
+	}
+#ifdef SMALL_SCREEN_DEVICE
+	case kChooseKeyMappingCmd:
+		_keysDialog->runModal();
+		break;
+#endif
+	default:
+		OptionsDialog::handleCommand(sender, cmd, data);
+	}
+}
+
+} // End of namespace GUI