Added wxTopLevelWindow::HasFocus() as discussed.

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index b1b15cb8d6919b57b9dbca0b0244c8149506bdbd..dbbaba2799a8eb9181ac5d8a562acca1a4670dd1 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -16,7 +16,7 @@
 
 #if wxUSE_STREAMS
 
-class WXDLLEXPORT wxMemoryInputStream : public wxInputStream
+class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream
 {
 public:
     wxMemoryInputStream(const void *data, size_t length);
@@ -35,14 +35,16 @@ protected:
     wxStreamBuffer *m_i_streambuf;
 
     size_t OnSysRead(void *buffer, size_t nbytes);
-    off_t OnSysSeek(off_t pos, wxSeekMode mode);
-    off_t OnSysTell() const;
+    wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
+    wxFileOffset OnSysTell() const;
 
 private:
     size_t m_length;
+
+    DECLARE_NO_COPY_CLASS(wxMemoryInputStream)
 };
 
-class WXDLLEXPORT wxMemoryOutputStream : public wxOutputStream
+class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream
 {
 public:
     // if data is !NULL it must be allocated with malloc()
@@ -62,8 +64,10 @@ protected:
 
 protected:
     size_t OnSysWrite(const void *buffer, size_t nbytes);
-    off_t OnSysSeek(off_t pos, wxSeekMode mode);
-    off_t OnSysTell() const;
+    wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
+    wxFileOffset OnSysTell() const;
+
+    DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)
 };
 
 #endif