fixed virtual function hiding for LoadBitmap()

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

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index d544b3abc9044db065356357695a3c6ed79bb282..59e73bd75fe83a267054ff8ba819bb4b3a0c467d 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -6,7 +6,7 @@
 // Created:     17/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     17/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __SCK_STREAM_H__
 #define __SCK_STREAM_H__


@@ -27,9 +27,9 @@ class WXDLLIMPEXP_NET wxSocketOutputStream : public wxOutputStream
   wxSocketOutputStream(wxSocketBase& s);
   ~wxSocketOutputStream();
 
   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() const
+  wxFileOffset TellO() const

     { return -1; }
 
  protected:
     { return -1; }
 
  protected:


@@ -46,9 +46,9 @@ class WXDLLIMPEXP_NET wxSocketInputStream : public wxInputStream
   wxSocketInputStream(wxSocketBase& s);
   ~wxSocketInputStream();
 
   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() const
+  wxFileOffset TellI() const

     { return -1; }
 
  protected:
     { return -1; }
 
  protected: