Calculate correct client size for windows that are using deferred sizing.

[wxWidgets.git] / src / common / sckfile.cpp

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index e48f33693f355b1c72f469a04d2058990ff5dfce..ba55e1ce96c6562ea4aae067a2c737fd7a45b179 100644 (file)
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -6,11 +6,8 @@
 // Created:     20/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     20/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-#ifdef __GNUG__
-#pragma implementation "sckfile.h"
-#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -23,18 +20,19 @@
   #include "wx/defs.h"
 #endif
 
   #include "wx/defs.h"
 #endif
 

-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE

 
 #include <stdio.h>
 #include "wx/wfstream.h"
 #include "wx/protocol/file.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
 
 #include <stdio.h>
 #include "wx/wfstream.h"
 #include "wx/protocol/file.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)

-IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, FALSE)
+IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, false)

 
 wxFileProto::wxFileProto()
 
 wxFileProto::wxFileProto()

-  : wxProtocol()
+           : wxProtocol()

 {
 {

+    m_error = wxPROTO_NOERR;

 }
 
 wxFileProto::~wxFileProto()
 }
 
 wxFileProto::~wxFileProto()


@@ -43,8 +41,19 @@ wxFileProto::~wxFileProto()
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {

-  return new wxFileInputStream(path);
+    wxFileInputStream *retval = new wxFileInputStream(wxURI::Unescape(path));
+    if ( retval->Ok() )
+    {
+        m_error = wxPROTO_NOERR;
+
+        return retval;
+    }
+
+    m_error = wxPROTO_NOFILE;
+    delete retval;
+
+    return NULL;

 }
 
 }
 

-#endif
+#endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE