mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-17 19:49:12 +01:00
822326eea9
From wxWidgets master 81570ae070b35c9d52de47b1f14897f3ff1a66c7. include/wx/defs.h -- __w64 warning disable patch by comex brought forward. include/wx/msw/window.h -- added GetContentScaleFactor() which was not implemented on Windows but is necessary for wxBitmap scaling on Mac OS X so it needs to work to avoid #ifdef-ing the code. src/gtk/window.cpp -- Modified DoSetClientSize() to direct call wxWindowGTK::DoSetSize() instead of using public wxWindowBase::SetSize() which now prevents derived classes (like wxAuiToolbar) intercepting the call and breaking it. This matches Windows which does NOT need to call DoSetSize internally. End result is this fixes Dolphin's debug tools toolbars on Linux. src/osx/window_osx.cpp -- Same fix as for GTK since it has the same issue. src/msw/radiobox.cpp -- Hacked to fix display in HiDPI (was clipping off end of text). Updated CMakeLists for Linux and Mac OS X. Small code changes to Dolphin to fix debug error boxes, deprecation warnings, and retain previous UI behavior on Windows.
97 lines
3.1 KiB
C++
97 lines
3.1 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/protocol/http.h
|
|
// Purpose: HTTP protocol
|
|
// Author: Guilhem Lavaux
|
|
// Modified by: Simo Virokannas (authentication, Dec 2005)
|
|
// Created: August 1997
|
|
// Copyright: (c) 1997, 1998 Guilhem Lavaux
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
#ifndef _WX_HTTP_H
|
|
#define _WX_HTTP_H
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_PROTOCOL_HTTP
|
|
|
|
#include "wx/hashmap.h"
|
|
#include "wx/protocol/protocol.h"
|
|
#include "wx/buffer.h"
|
|
|
|
class WXDLLIMPEXP_NET wxHTTP : public wxProtocol
|
|
{
|
|
public:
|
|
wxHTTP();
|
|
virtual ~wxHTTP();
|
|
|
|
virtual bool Connect(const wxString& host, unsigned short port);
|
|
virtual bool Connect(const wxString& host) wxOVERRIDE { return Connect(host, 0); }
|
|
virtual bool Connect(const wxSockAddress& addr, bool wait = true) wxOVERRIDE;
|
|
bool Abort() wxOVERRIDE;
|
|
|
|
wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE;
|
|
|
|
wxString GetContentType() const wxOVERRIDE;
|
|
wxString GetHeader(const wxString& header) const;
|
|
int GetResponse() const { return m_http_response; }
|
|
|
|
void SetMethod(const wxString& method) { m_method = method; }
|
|
void SetHeader(const wxString& header, const wxString& h_data);
|
|
bool SetPostText(const wxString& contentType,
|
|
const wxString& data,
|
|
const wxMBConv& conv = wxConvUTF8);
|
|
bool SetPostBuffer(const wxString& contentType, const wxMemoryBuffer& data);
|
|
void SetProxyMode(bool on);
|
|
|
|
/* Cookies */
|
|
wxString GetCookie(const wxString& cookie) const;
|
|
bool HasCookies() const { return m_cookies.size() > 0; }
|
|
|
|
// Use the other SetPostBuffer() overload or SetPostText() instead.
|
|
wxDEPRECATED(void SetPostBuffer(const wxString& post_buf));
|
|
|
|
protected:
|
|
typedef wxStringToStringHashMap::iterator wxHeaderIterator;
|
|
typedef wxStringToStringHashMap::const_iterator wxHeaderConstIterator;
|
|
typedef wxStringToStringHashMap::iterator wxCookieIterator;
|
|
typedef wxStringToStringHashMap::const_iterator wxCookieConstIterator;
|
|
|
|
bool BuildRequest(const wxString& path, const wxString& method);
|
|
void SendHeaders();
|
|
bool ParseHeaders();
|
|
|
|
wxString GenerateAuthString(const wxString& user, const wxString& pass) const;
|
|
|
|
// find the header in m_headers
|
|
wxHeaderIterator FindHeader(const wxString& header);
|
|
wxHeaderConstIterator FindHeader(const wxString& header) const;
|
|
wxCookieIterator FindCookie(const wxString& cookie);
|
|
wxCookieConstIterator FindCookie(const wxString& cookie) const;
|
|
|
|
// deletes the header value strings
|
|
void ClearHeaders();
|
|
void ClearCookies();
|
|
|
|
// internal variables:
|
|
|
|
wxString m_method;
|
|
wxStringToStringHashMap m_cookies;
|
|
|
|
wxStringToStringHashMap m_headers;
|
|
bool m_read,
|
|
m_proxy_mode;
|
|
wxSockAddress *m_addr;
|
|
wxMemoryBuffer m_postBuffer;
|
|
wxString m_contentType;
|
|
int m_http_response;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxHTTP);
|
|
DECLARE_PROTOCOL(wxHTTP)
|
|
wxDECLARE_NO_COPY_CLASS(wxHTTP);
|
|
};
|
|
|
|
#endif // wxUSE_PROTOCOL_HTTP
|
|
|
|
#endif // _WX_HTTP_H
|
|
|