Don't infinitely recurse when setting the child focus. Without

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

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

-#if defined(__GNUG__) && !defined(__APPLE__)
+#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 WXDLLIMPEXP_BASE wxSocketOutputStream : public wxOutputStream
+class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream

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


@@ -40,7 +40,7 @@ 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);


@@ -59,7 +59,7 @@ 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:
                    public wxSocketOutputStream
 {
  public: