projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
define HDS_FLAT not defined in VC6 headers
[wxWidgets.git]
/
include
/
wx
/
sckstrm.h
diff --git
a/include/wx/sckstrm.h
b/include/wx/sckstrm.h
index de42898eac9bab3c4077b658d310e4b717fdb867..60fced8eb222c4fcd23ce43efebdf2236a49ffc2 100644
(file)
--- a/
include/wx/sckstrm.h
+++ b/
include/wx/sckstrm.h
@@
-11,25
+11,21
@@
#ifndef __SCK_STREAM_H__
#define __SCK_STREAM_H__
#ifndef __SCK_STREAM_H__
#define __SCK_STREAM_H__
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
-
#include "wx/stream.h"
#if wxUSE_SOCKETS && wxUSE_STREAMS
#include "wx/socket.h"
#include "wx/stream.h"
#if wxUSE_SOCKETS && wxUSE_STREAMS
#include "wx/socket.h"
-class WXDLLIMPEXP_
BASE
wxSocketOutputStream : public wxOutputStream
+class WXDLLIMPEXP_
NET
wxSocketOutputStream : public wxOutputStream
{
public:
wxSocketOutputStream(wxSocketBase& s);
{
public:
wxSocketOutputStream(wxSocketBase& s);
- ~wxSocketOutputStream();
+
virtual
~wxSocketOutputStream();
-
off_t SeekO( off_
t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
+
wxFileOffset SeekO( wxFileOffse
t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
{ return -1; }
{ return -1; }
-
off_
t TellO() const
+
wxFileOffse
t TellO() const
{ return -1; }
protected:
{ return -1; }
protected:
@@
-40,15
+36,15
@@
class WXDLLIMPEXP_BASE wxSocketOutputStream : public wxOutputStream
DECLARE_NO_COPY_CLASS(wxSocketOutputStream)
};
DECLARE_NO_COPY_CLASS(wxSocketOutputStream)
};
-class WXDLLIMPEXP_
BASE
wxSocketInputStream : public wxInputStream
+class WXDLLIMPEXP_
NET
wxSocketInputStream : public wxInputStream
{
public:
wxSocketInputStream(wxSocketBase& s);
{
public:
wxSocketInputStream(wxSocketBase& s);
- ~wxSocketInputStream();
+
virtual
~wxSocketInputStream();
-
off_t SeekI( off_
t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
+
wxFileOffset SeekI( wxFileOffse
t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
{ return -1; }
{ return -1; }
-
off_
t TellI() const
+
wxFileOffse
t TellI() const
{ return -1; }
protected:
{ return -1; }
protected:
@@
-59,12
+55,12
@@
class WXDLLIMPEXP_BASE wxSocketInputStream : public wxInputStream
DECLARE_NO_COPY_CLASS(wxSocketInputStream)
};
DECLARE_NO_COPY_CLASS(wxSocketInputStream)
};
-class WXDLLIMPEXP_
BASE
wxSocketStream : public wxSocketInputStream,
+class WXDLLIMPEXP_
NET
wxSocketStream : public wxSocketInputStream,
public wxSocketOutputStream
{
public:
wxSocketStream(wxSocketBase& s);
public wxSocketOutputStream
{
public:
wxSocketStream(wxSocketBase& s);
- ~wxSocketStream();
+
virtual
~wxSocketStream();
DECLARE_NO_COPY_CLASS(wxSocketStream)
};
DECLARE_NO_COPY_CLASS(wxSocketStream)
};