mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 01:29: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.
69 lines
2.1 KiB
C++
69 lines
2.1 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/evtloopconsole.h
|
|
// Purpose: wxConsoleEventLoop class for Windows
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 2004-07-31
|
|
// Copyright: (c) 2003-2004 Vadim Zeitlin <vadim@wxwindows.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_EVTLOOPCONSOLE_H_
|
|
#define _WX_MSW_EVTLOOPCONSOLE_H_
|
|
|
|
class WXDLLIMPEXP_BASE wxMSWEventLoopBase : public wxEventLoopManual
|
|
{
|
|
public:
|
|
wxMSWEventLoopBase();
|
|
virtual ~wxMSWEventLoopBase();
|
|
|
|
// implement base class pure virtuals
|
|
virtual bool Pending() const;
|
|
virtual void WakeUp();
|
|
|
|
#if wxUSE_THREADS
|
|
// MSW-specific method to wait for the termination of the specified (by its
|
|
// native handle) thread or any input message arriving (in GUI case).
|
|
//
|
|
// Return value is WAIT_OBJECT_0 if the thread terminated, WAIT_OBJECT_0+1
|
|
// if a message arrived with anything else indicating an error.
|
|
WXDWORD MSWWaitForThread(WXHANDLE hThread);
|
|
#endif // wxUSE_THREADS
|
|
|
|
protected:
|
|
// get the next message from queue and return true or return false if we
|
|
// got WM_QUIT or an error occurred
|
|
bool GetNextMessage(WXMSG *msg);
|
|
|
|
// same as above but with a timeout and return value can be -1 meaning that
|
|
// time out expired in addition to true/false
|
|
int GetNextMessageTimeout(WXMSG *msg, unsigned long timeout);
|
|
|
|
private:
|
|
// An auto-reset Win32 event which is signalled when we need to wake up the
|
|
// main thread waiting in GetNextMessage[Timeout]().
|
|
WXHANDLE m_heventWake;
|
|
};
|
|
|
|
#if wxUSE_CONSOLE_EVENTLOOP
|
|
|
|
class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxMSWEventLoopBase
|
|
{
|
|
public:
|
|
wxConsoleEventLoop() { }
|
|
|
|
// override/implement base class virtuals
|
|
virtual bool Dispatch();
|
|
virtual int DispatchTimeout(unsigned long timeout);
|
|
|
|
// Windows-specific function to process a single message
|
|
virtual void ProcessMessage(WXMSG *msg);
|
|
|
|
protected:
|
|
virtual void DoYieldFor(long eventsToProcess);
|
|
};
|
|
|
|
#endif // wxUSE_CONSOLE_EVENTLOOP
|
|
|
|
#endif // _WX_MSW_EVTLOOPCONSOLE_H_
|