More wxMotif work, OGL enhancements, USE_ macro corrections, object.cpp delete

[wxWidgets.git] / include / wx / mstream.h

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index dc8c6688d7e852360a044915cd7b471fb8420949..2214aa58e55ed2f5a4206aa8dd909c1a12ec791f 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -8,8 +8,8 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#ifndef __WXMMSTREAM_H__
-#define __WXMMSTREAM_H__
+#ifndef _WX_WXMMSTREAM_H__
+#define _WX_WXMMSTREAM_H__
 
 #include <wx/stream.h>
 
@@ -27,11 +27,13 @@ class wxMemoryStreamBase {
   int m_iolimit;
 };
 
-class wxMemoryInputStream: virtual public wxMemoryStreamBase, public wxInputStream {
+class wxMemoryInputStream: public virtual wxMemoryStreamBase, public wxInputStream {
  public:
   wxMemoryInputStream(const char *data, size_t length);
   virtual ~wxMemoryInputStream();
 
+  char Peek();
+
  protected:
  
   size_t DoRead(void *buffer, size_t size);
@@ -42,7 +44,7 @@ class wxMemoryInputStream: virtual public wxMemoryStreamBase, public wxInputStre
   off_t m_position_i;
 };
 
-class wxMemoryOutputStream: virtual public wxMemoryStreamBase, public wxOutputStream {
+class wxMemoryOutputStream: public virtual wxMemoryStreamBase, public wxOutputStream {
  public:
   wxMemoryOutputStream(char *data = NULL, size_t length = 0);
   virtual ~wxMemoryOutputStream();