[Scummvm-cvs-logs] SF.net SVN: scummvm:[42623] scummvm/trunk/gui

[wjpalenstijn at users.sourceforge.net]

Revision: 42623
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42623&view=rev
Author:   wjpalenstijn
Date:     2009-07-19 21:06:25 +0000 (Sun, 19 Jul 2009)

Log Message:
-----------
Fix compilation with USE_CONSOLE = 0

Modified Paths:
--------------
    scummvm/trunk/gui/debugger.cpp
    scummvm/trunk/gui/debugger.h

Modified: scummvm/trunk/gui/debugger.cpp
===================================================================
--- scummvm/trunk/gui/debugger.cpp	2009-07-19 19:56:52 UTC (rev 42622)
+++ scummvm/trunk/gui/debugger.cpp	2009-07-19 21:06:25 UTC (rev 42623)
@@ -39,9 +39,11 @@
 	_isAttached = false;
 	_errStr = NULL;
 	_firstTime = true;
+#if USE_CONSOLE
 	_debuggerDialog = new GUI::ConsoleDialog(1.0f, 0.67f);
 	_debuggerDialog->setInputCallback(debuggerInputCallback, this);
 	_debuggerDialog->setCompletionCallback(debuggerCompletionCallback, this);
+#endif
 
 	//DCmd_Register("continue",			WRAP_METHOD(Debugger, Cmd_Exit));
 	DCmd_Register("exit",				WRAP_METHOD(Debugger, Cmd_Exit));
@@ -55,7 +57,9 @@
 }
 
 Debugger::~Debugger() {
+#if USE_CONSOLE
 	delete _debuggerDialog;
+#endif
 }
 
 
@@ -357,8 +361,11 @@
 // Print a list of all registered commands (and variables, if any),
 // nicely word-wrapped.
 bool Debugger::Cmd_Help(int argc, const char **argv) {
-
+#if USE_CONSOLE
 	const int charsPerLine = _debuggerDialog->getCharsPerLine();
+#else
+	const int charsPerLine = 80;
+#endif
 	int width, size;
 	uint i;
 

Modified: scummvm/trunk/gui/debugger.h
===================================================================
--- scummvm/trunk/gui/debugger.h	2009-07-19 19:56:52 UTC (rev 42622)
+++ scummvm/trunk/gui/debugger.h	2009-07-19 21:06:25 UTC (rev 42623)
@@ -35,7 +35,7 @@
 // Choose between text console or ScummConsole
 #define USE_CONSOLE	1
 
-#ifdef USE_CONSOLE
+#if USE_CONSOLE
 class ConsoleDialog;
 #endif
 
@@ -86,7 +86,9 @@
 	bool _isAttached;
 	char *_errStr;
 	bool _firstTime;
+#if USE_CONSOLE
 	GUI::ConsoleDialog *_debuggerDialog;
+#endif
 
 protected:
 	// Hook for subclasses: Called just before enter() is run


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.