diff options
Diffstat (limited to 'gui/console.h')
| -rw-r--r-- | gui/console.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gui/console.h b/gui/console.h index bf44bdbe17..7136043de9 100644 --- a/gui/console.h +++ b/gui/console.h @@ -26,7 +26,6 @@ #define CONSOLE_DIALOG_H #include "gui/dialog.h" -#include "gui/GuiManager.h" namespace GUI { @@ -143,10 +142,10 @@ public: void handleKeyDown(Common::KeyState state); void handleCommand(CommandSender *sender, uint32 cmd, uint32 data); - int printf(const char *format, ...) GCC_PRINTF(2, 3); - int vprintf(const char *format, va_list argptr); -#undef putchar - void putchar(int c); + int printFormat(int dummy, const char *format, ...) GCC_PRINTF(3, 4); + int vprintFormat(int dummy, const char *format, va_list argptr); + + void printChar(int c); void setInputCallback(InputCallbackProc proc, void *refCon) { _callbackProc = proc; @@ -172,7 +171,7 @@ protected: void drawLine(int line, bool restoreBg = true); void drawCaret(bool erase); - void putcharIntern(int c); + void printCharIntern(int c); void insertIntoPrompt(const char *str); void print(const char *str); void updateScrollBuffer(); |