projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switching to defines not having a value for __WXMAC__
[wxWidgets.git]
/
include
/
wx
/
sckstrm.h
diff --git
a/include/wx/sckstrm.h
b/include/wx/sckstrm.h
index 7e5159294ae9f819c6c170534a903dfb3618bdc9..59e73bd75fe83a267054ff8ba819bb4b3a0c467d 100644
(file)
--- a/
include/wx/sckstrm.h
+++ b/
include/wx/sckstrm.h
@@
-11,7
+11,7
@@
#ifndef __SCK_STREAM_H__
#define __SCK_STREAM_H__
#ifndef __SCK_STREAM_H__
#define __SCK_STREAM_H__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface
#endif
#pragma interface
#endif
@@
-21,46
+21,52
@@
#include "wx/socket.h"
#include "wx/socket.h"
-class WXDLL
EXPOR
T wxSocketOutputStream : public wxOutputStream
+class WXDLL
IMPEXP_NE
T wxSocketOutputStream : public wxOutputStream
{
public:
wxSocketOutputStream(wxSocketBase& s);
~wxSocketOutputStream();
{
public:
wxSocketOutputStream(wxSocketBase& s);
~wxSocketOutputStream();
- off_t SeekO( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
+ wxFileOffset SeekO( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
{ return -1; }
{ return -1; }
- off_t TellO()
+ wxFileOffset TellO() const
{ return -1; }
protected:
wxSocketBase *m_o_socket;
size_t OnSysWrite(const void *buffer, size_t bufsize);
{ return -1; }
protected:
wxSocketBase *m_o_socket;
size_t OnSysWrite(const void *buffer, size_t bufsize);
+
+ DECLARE_NO_COPY_CLASS(wxSocketOutputStream)
};
};
-class WXDLL
EXPOR
T wxSocketInputStream : public wxInputStream
+class WXDLL
IMPEXP_NE
T wxSocketInputStream : public wxInputStream
{
public:
wxSocketInputStream(wxSocketBase& s);
~wxSocketInputStream();
{
public:
wxSocketInputStream(wxSocketBase& s);
~wxSocketInputStream();
- off_t SeekI( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
+ wxFileOffset SeekI( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
{ return -1; }
{ return -1; }
- off_t TellI()
+ wxFileOffset TellI() const
{ return -1; }
protected:
wxSocketBase *m_i_socket;
size_t OnSysRead(void *buffer, size_t bufsize);
{ return -1; }
protected:
wxSocketBase *m_i_socket;
size_t OnSysRead(void *buffer, size_t bufsize);
+
+ DECLARE_NO_COPY_CLASS(wxSocketInputStream)
};
};
-class WXDLL
EXPOR
T wxSocketStream : public wxSocketInputStream,
+class WXDLL
IMPEXP_NE
T wxSocketStream : public wxSocketInputStream,
public wxSocketOutputStream
{
public:
wxSocketStream(wxSocketBase& s);
~wxSocketStream();
public wxSocketOutputStream
{
public:
wxSocketStream(wxSocketBase& s);
~wxSocketStream();
+
+ DECLARE_NO_COPY_CLASS(wxSocketStream)
};
#endif
};
#endif