JPEG handler does not read entire file into memory anymore (+, of course, that header...

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 813ac542e57777c017262a3fd7f93eb886efd326..8c680f6905fda10fb88bbaff181d34a40a3bbfe4 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -23,15 +23,13 @@
 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 

-#include <wx/string.h>
-#include <wx/list.h>
-#include <wx/utils.h>
-#include <wx/url.h>
+#include "wx/string.h"
+#include "wx/list.h"
+#include "wx/utils.h"
+#include "wx/url.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_CLASS(wxProtoInfo, wxObject)
 IMPLEMENT_CLASS(wxURL, wxObject)
 IMPLEMENT_CLASS(wxProtoInfo, wxObject)
 IMPLEMENT_CLASS(wxURL, wxObject)

-#endif

 
 // Protocols list
 wxProtoInfo *wxURL::g_protocols = NULL;
 
 // Protocols list
 wxProtoInfo *wxURL::g_protocols = NULL;


@@ -162,7 +160,7 @@ bool wxURL::PrepHost(wxString& url)
   wxString temp_url;
   int pos, pos2;
 
   wxString temp_url;
   int pos, pos2;
 

-  if ((url.GetChar(0) != '/') || (url.GetChar(1) != '/'))
+  if ((url.GetChar(0) != wxT('/')) || (url.GetChar(1) != wxT('/')))

     return FALSE;
 
   url = url(2, url.Length());
     return FALSE;
 
   url = url(2, url.Length());


@@ -240,7 +238,7 @@ bool wxURL::FetchProtocol()
 // --------- wxURL get ------------------------------------------
 // --------------------------------------------------------------
 
 // --------- wxURL get ------------------------------------------
 // --------------------------------------------------------------
 

-wxInputStream *wxURL::GetInputStream(void)
+wxInputStream *wxURL::GetInputStream()

 {
   wxInputStream *the_i_stream = NULL;
 
 {
   wxInputStream *the_i_stream = NULL;