Applied patch [ 858324 ] Calling EndModal inside an EVT_INIT_DIALOG event handler

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

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index 6ef70e4e91b0dfdab398189519e3d58fe439271b..a987d8c15e026b87a5556b22c384974b2d2898f7 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__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -21,7 +21,7 @@
 
 #include "wx/socket.h"
 
 
 #include "wx/socket.h"
 

-class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
+class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream

 {
  public:
   wxSocketOutputStream(wxSocketBase& s);
 {
  public:
   wxSocketOutputStream(wxSocketBase& s);


@@ -36,9 +36,11 @@ class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
   wxSocketBase *m_o_socket;
 
   size_t OnSysWrite(const void *buffer, size_t bufsize);
   wxSocketBase *m_o_socket;
 
   size_t OnSysWrite(const void *buffer, size_t bufsize);

+
+    DECLARE_NO_COPY_CLASS(wxSocketOutputStream)

 };
 
 };
 

-class WXDLLEXPORT wxSocketInputStream : public wxInputStream
+class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream

 {
  public:
   wxSocketInputStream(wxSocketBase& s);
 {
  public:
   wxSocketInputStream(wxSocketBase& s);


@@ -53,14 +55,18 @@ class WXDLLEXPORT wxSocketInputStream : public wxInputStream
   wxSocketBase *m_i_socket;
 
   size_t OnSysRead(void *buffer, size_t bufsize);
   wxSocketBase *m_i_socket;
 
   size_t OnSysRead(void *buffer, size_t bufsize);

+
+    DECLARE_NO_COPY_CLASS(wxSocketInputStream)

 };
 
 };
 

-class WXDLLEXPORT wxSocketStream : public wxSocketInputStream,
+class WXDLLIMPEXP_NET wxSocketStream : public wxSocketInputStream,

                    public wxSocketOutputStream
 {
  public:
   wxSocketStream(wxSocketBase& s);
   ~wxSocketStream();
                    public wxSocketOutputStream
 {
  public:
   wxSocketStream(wxSocketBase& s);
   ~wxSocketStream();

+
+  DECLARE_NO_COPY_CLASS(wxSocketStream)

 };
 
 #endif
 };
 
 #endif