mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 18:49:11 +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.
67 lines
1.9 KiB
C++
67 lines
1.9 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/private/gsockmsw.h
|
|
// Purpose: MSW-specific socket implementation
|
|
// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia, Vadim Zeitlin
|
|
// Created: April 1997
|
|
// Copyright: (C) 1999-1997, Guilhem Lavaux
|
|
// (C) 1999-2000, Guillermo Rodriguez Garcia
|
|
// (C) 2008 Vadim Zeitlin
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
#ifndef _WX_MSW_GSOCKMSW_H_
|
|
#define _WX_MSW_GSOCKMSW_H_
|
|
|
|
#include "wx/msw/wrapwin.h"
|
|
|
|
#if defined(__CYGWIN__)
|
|
//CYGWIN gives annoying warning about runtime stuff if we don't do this
|
|
# define USE_SYS_TYPES_FD_SET
|
|
# include <sys/types.h>
|
|
#endif
|
|
|
|
#if defined(__CYGWIN__)
|
|
#include <winsock.h>
|
|
#endif
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// MSW-specific socket implementation
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class wxSocketImplMSW : public wxSocketImpl
|
|
{
|
|
public:
|
|
wxSocketImplMSW(wxSocketBase& wxsocket);
|
|
|
|
virtual ~wxSocketImplMSW();
|
|
|
|
virtual wxSocketError GetLastError() const;
|
|
|
|
virtual void ReenableEvents(wxSocketEventFlags WXUNUSED(flags))
|
|
{
|
|
// notifications are never disabled in this implementation, there is no
|
|
// need for this as WSAAsyncSelect() only sends notification once when
|
|
// the new data becomes available anyhow, so there is no need to do
|
|
// anything here
|
|
}
|
|
|
|
private:
|
|
virtual void DoClose();
|
|
|
|
virtual void UnblockAndRegisterWithEventLoop()
|
|
{
|
|
// no need to make the socket non-blocking, Install_Callback() will do
|
|
// it
|
|
wxSocketManager::Get()->Install_Callback(this);
|
|
}
|
|
|
|
int m_msgnumber;
|
|
|
|
friend class wxSocketMSWManager;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxSocketImplMSW);
|
|
};
|
|
|
|
#endif /* _WX_MSW_GSOCKMSW_H_ */
|