New colour, font, theme and size code..

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 9f7e3adabc05cb849a57007b13576f5a373d491a..26820e2f02a81f9acc36edd896ce2bc7447a28c8 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -32,10 +32,8 @@
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"
 
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
 IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), TRUE)
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
 IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), TRUE)

-#endif

 
 #define HTTP_BSIZE 2048
 
 
 #define HTTP_BSIZE 2048
 


@@ -96,7 +94,7 @@ wxString wxHTTP::GetHeader(const wxString& header)
   wxString upper_header;
 
   upper_header = header.Upper();
   wxString upper_header;
 
   upper_header = header.Upper();

-  
+

   node = m_headers.Find(upper_header);
   if (!node)
     return wxEmptyString;
   node = m_headers.Find(upper_header);
   if (!node)
     return wxEmptyString;


@@ -130,7 +128,13 @@ bool wxHTTP::ParseHeaders()
   m_headers.Clear();
   m_read = TRUE;
 
   m_headers.Clear();
   m_read = TRUE;
 

-  while (1) {
+#if defined(__VISAGECPP__)
+// VA just can't stand while(1)
+    bool bOs2var = TRUE;
+    while(bOs2var) {
+#else
+    while (1) {
+#endif

     m_perr = GetLine(this, line);
     if (m_perr != wxPROTO_NOERR)
       return FALSE;
     m_perr = GetLine(this, line);
     if (m_perr != wxPROTO_NOERR)
       return FALSE;


@@ -197,7 +201,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 
   // If there is no User-Agent defined, define it.
   if (GetHeader(wxT("User-Agent")).IsNull())
 
   // If there is no User-Agent defined, define it.
   if (GetHeader(wxT("User-Agent")).IsNull())

-    SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x")); 
+    SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x"));

 
   switch (req) {
   case wxHTTP_GET:
 
   switch (req) {
   case wxHTTP_GET: