Use #ifdef _WIN32 rather than WIN32

[libs/core.git] / source / io / console.h

diff --git a/source/io/console.h b/source/io/console.h
index 54774323558a905d8dbe416114d932fd5e279d83..e2b5d533cc0f1ac6d45749fbbbde7f9b712b5688 100644 (file)
--- a/source/io/console.h
+++ b/source/io/console.h
@@ -1,7 +1,7 @@
 #ifndef MSP_IO_CONSOLE_H_
 #define MSP_IO_CONSOLE_H_
 
-#include "base.h"
+#include "eventobject.h"
 #include "handle.h"
 
 namespace Msp {
@@ -12,12 +12,22 @@ Provides access to standard input, output and error streams.  This class can't
 be instantiated directly - use one of the cin, cout and cerr references
 instead.
 */
-class Console: public Base
+class Console: public EventObject
 {
+public:
+       enum Stream
+       {
+               CIN = 0,
+               COUT = 1,
+               CERR = 2
+       };
+
 private:
+       Stream stream;
        Handle handle;
 
-       Console(unsigned);
+       Console(Stream);
+       void platform_init();
 public:
        ~Console();
 
@@ -37,14 +47,20 @@ public:
        Console. */
        void get_size(unsigned &rows, unsigned &cols);
 
+       /** Redirects input from or output to another I/O object.  This performs a
+       system-level redirect.  Closing the other object won't affect the
+       redirection. */
+       void redirect(Base &);
+
 protected:
        virtual unsigned do_write(const char *, unsigned);
        virtual unsigned do_read(char *, unsigned);
 
 public:
+       virtual const Handle &get_handle(Mode);
        virtual const Handle &get_event_handle() { return handle; }
 
-       static Console &instance(unsigned);
+       static Console &instance(Stream);
 };
 
 extern Console &cin;