1. suppressed some messages from HasEntry()/HasKeys()

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

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index 86782eddf2e8d80ea4543fa9c49be548a3b7469d..0f05c8c3f7b369d1cdbb9cc4e79480dfa9633d14 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -22,7 +22,7 @@ class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
 {
  public:
   wxSocketOutputStream(wxSocketBase& s);
 {
  public:
   wxSocketOutputStream(wxSocketBase& s);

-  virtual ~wxSocketOutputStream();
+  ~wxSocketOutputStream();

 
   wxOutputStream& Write(const void *buffer, size_t size);
   off_t SeekO( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) ) 
 
   wxOutputStream& Write(const void *buffer, size_t size);
   off_t SeekO( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) ) 


@@ -30,8 +30,6 @@ class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
   off_t TellO() 
     { return -1; }
 
   off_t TellO() 
     { return -1; }
 

-  bool Bad() { return m_o_socket->IsDisconnected(); }
-  size_t LastWrite() { return m_o_socket->LastCount(); }

  protected:
   wxSocketBase *m_o_socket;
 };
  protected:
   wxSocketBase *m_o_socket;
 };


@@ -48,19 +46,16 @@ class WXDLLEXPORT wxSocketInputStream : public wxInputStream
   off_t TellI() 
     { return -1; }
 
   off_t TellI() 
     { return -1; }
 

-  bool Eof() { return m_i_socket->IsDisconnected(); }
-  size_t LastRead() { return m_i_socket->LastCount(); }

  protected:
   wxSocketBase *m_i_socket;
 };
 
 class WXDLLEXPORT wxSocketStream : public wxSocketInputStream,
  protected:
   wxSocketBase *m_i_socket;
 };
 
 class WXDLLEXPORT wxSocketStream : public wxSocketInputStream,

-                                   public wxSocketOutputStream,
-                                  public wxStream {
-
+                                  public wxSocketOutputStream
+{

  public:
  public:

-  wxSocketStream(wxSocketBase& i_s, wxSocketBase& o_s);

   wxSocketStream(wxSocketBase& s);
   wxSocketStream(wxSocketBase& s);

+  ~wxSocketStream();

 };
 
 #endif
 };
 
 #endif