mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 20:31:50 +02: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.
116 lines
2.6 KiB
C++
116 lines
2.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/url.h
|
|
// Purpose: URL parser
|
|
// Author: Guilhem Lavaux
|
|
// Modified by: Ryan Norton
|
|
// Created: 20/07/1997
|
|
// Copyright: (c) 1997, 1998 Guilhem Lavaux
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_URL_H
|
|
#define _WX_URL_H
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_URL
|
|
|
|
#include "wx/uri.h"
|
|
#include "wx/protocol/protocol.h"
|
|
|
|
#if wxUSE_PROTOCOL_HTTP
|
|
#include "wx/protocol/http.h"
|
|
#endif
|
|
|
|
enum wxURLError {
|
|
wxURL_NOERR = 0,
|
|
wxURL_SNTXERR,
|
|
wxURL_NOPROTO,
|
|
wxURL_NOHOST,
|
|
wxURL_NOPATH,
|
|
wxURL_CONNERR,
|
|
wxURL_PROTOERR
|
|
};
|
|
|
|
#if wxUSE_URL_NATIVE
|
|
class WXDLLIMPEXP_FWD_NET wxURL;
|
|
|
|
class WXDLLIMPEXP_NET wxURLNativeImp : public wxObject
|
|
{
|
|
public:
|
|
virtual ~wxURLNativeImp() { }
|
|
virtual wxInputStream *GetInputStream(wxURL *owner) = 0;
|
|
};
|
|
#endif // wxUSE_URL_NATIVE
|
|
|
|
class WXDLLIMPEXP_NET wxURL : public wxURI
|
|
{
|
|
public:
|
|
wxURL(const wxString& sUrl = wxEmptyString);
|
|
wxURL(const wxURI& uri);
|
|
wxURL(const wxURL& url);
|
|
virtual ~wxURL();
|
|
|
|
wxURL& operator = (const wxString& url);
|
|
wxURL& operator = (const wxURI& uri);
|
|
wxURL& operator = (const wxURL& url);
|
|
|
|
wxProtocol& GetProtocol() { return *m_protocol; }
|
|
wxURLError GetError() const { return m_error; }
|
|
wxString GetURL() const { return m_url; }
|
|
|
|
wxURLError SetURL(const wxString &url)
|
|
{ *this = url; return m_error; }
|
|
|
|
bool IsOk() const
|
|
{ return m_error == wxURL_NOERR; }
|
|
|
|
wxInputStream *GetInputStream();
|
|
|
|
#if wxUSE_PROTOCOL_HTTP
|
|
static void SetDefaultProxy(const wxString& url_proxy);
|
|
void SetProxy(const wxString& url_proxy);
|
|
#endif // wxUSE_PROTOCOL_HTTP
|
|
|
|
protected:
|
|
static wxProtoInfo *ms_protocols;
|
|
|
|
#if wxUSE_PROTOCOL_HTTP
|
|
static wxHTTP *ms_proxyDefault;
|
|
static bool ms_useDefaultProxy;
|
|
wxHTTP *m_proxy;
|
|
bool m_useProxy;
|
|
#endif // wxUSE_PROTOCOL_HTTP
|
|
|
|
#if wxUSE_URL_NATIVE
|
|
friend class wxURLNativeImp;
|
|
// pointer to a native URL implementation object
|
|
wxURLNativeImp *m_nativeImp;
|
|
// Creates on the heap and returns a native
|
|
// implementation object for the current platform.
|
|
static wxURLNativeImp *CreateNativeImpObject();
|
|
#endif // wxUSE_URL_NATIVE
|
|
|
|
wxProtoInfo *m_protoinfo;
|
|
wxProtocol *m_protocol;
|
|
|
|
wxURLError m_error;
|
|
wxString m_url;
|
|
|
|
void Init(const wxString&);
|
|
bool ParseURL();
|
|
void CleanData();
|
|
void Free();
|
|
bool FetchProtocol();
|
|
|
|
friend class wxProtoInfo;
|
|
friend class wxURLModule;
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxURL);
|
|
};
|
|
|
|
#endif // wxUSE_URL
|
|
|
|
#endif // _WX_URL_H
|
|
|