Move response data handling to base class

2018-10-29 23:00:08 +01:00
parent 5660565081
commit 6530e3c08e
4 changed files with 72 additions and 55 deletions
--- a/include/wx/msw/webrequest_winhttp.h
+++ b/include/wx/msw/webrequest_winhttp.h
@@ -32,22 +32,13 @@ public:

    wxString GetStatusText() const wxOVERRIDE;

-    wxInputStream* GetStream() const wxOVERRIDE;
-
-    wxString AsString(wxMBConv* conv = NULL) const wxOVERRIDE;
-
    bool ReadData();

    bool ReportAvailableData(DWORD dataLen);

-    void ReportDataComplete();
-
 private:
-    wxWebRequestWinHTTP& m_request;
+    HINTERNET m_requestHandle;
    wxInt64 m_contentLength;
-    long m_readSize;
-    wxMemoryBuffer m_readBuffer;
-    wxScopedPtr<wxInputStream> m_stream;

    wxDECLARE_NO_COPY_CLASS(wxWebResponseWinHTTP);
 };