handle NULL BSTRs as empty ones per Microsoft convention

[wxWidgets.git] / src / msw / urlmsw.cpp

diff --git a/src/msw/urlmsw.cpp b/src/msw/urlmsw.cpp
index 79b0ae8919fc7270c701e10f75329c56d57f4528..e24bcbb90be9d6445e20161539152f7be5fa2d73 100644 (file)
--- a/src/msw/urlmsw.cpp
+++ b/src/msw/urlmsw.cpp
@@ -18,6 +18,13 @@
 
 #if wxUSE_URL_NATIVE
 
 
 #if wxUSE_URL_NATIVE
 

+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/module.h"
+#endif
+

 #if !wxUSE_PROTOCOL_HTTP
 #include "wx/protocol/protocol.h"
 
 #if !wxUSE_PROTOCOL_HTTP
 #include "wx/protocol/protocol.h"
 


@@ -59,10 +66,6 @@ USE_PROTOCOL(wxHTTPDummyProto)
     #pragma comment(lib, "wininet.lib")
 #endif
 
     #pragma comment(lib, "wininet.lib")
 #endif
 

-#include "wx/string.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/module.h"

 #include "wx/url.h"
 
 #include <string.h>
 #include "wx/url.h"
 
 #include <string.h>


@@ -118,7 +121,7 @@ class /*WXDLLIMPEXP_NET */ wxWinINetInputStream : public wxInputStream
 {
 public:
     wxWinINetInputStream(HINTERNET hFile=0);
 {
 public:
     wxWinINetInputStream(HINTERNET hFile=0);

-    ~wxWinINetInputStream();
+    virtual ~wxWinINetInputStream();

 
     void Attach(HINTERNET hFile);
 
 
     void Attach(HINTERNET hFile);