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.
95 lines
3.1 KiB
C++
95 lines
3.1 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/apptrait.h
|
|
// Purpose: class implementing wxAppTraits for MSW
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 21.06.2003
|
|
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_APPTRAIT_H_
|
|
#define _WX_MSW_APPTRAIT_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
|
|
{
|
|
public:
|
|
virtual wxEventLoopBase *CreateEventLoop();
|
|
virtual void *BeforeChildWaitLoop();
|
|
virtual void AfterChildWaitLoop(void *data);
|
|
#if wxUSE_TIMER
|
|
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
|
|
#endif // wxUSE_TIMER
|
|
#if wxUSE_THREADS
|
|
virtual bool DoMessageFromThreadWait();
|
|
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);
|
|
#endif // wxUSE_THREADS
|
|
virtual bool CanUseStderr() { return true; }
|
|
virtual bool WriteToStderr(const wxString& text);
|
|
};
|
|
|
|
#if wxUSE_GUI
|
|
|
|
#if defined(__WXMSW__)
|
|
|
|
class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
|
|
{
|
|
public:
|
|
virtual wxEventLoopBase *CreateEventLoop();
|
|
virtual void *BeforeChildWaitLoop();
|
|
virtual void AfterChildWaitLoop(void *data);
|
|
#if wxUSE_TIMER
|
|
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
|
|
#endif // wxUSE_TIMER
|
|
#if wxUSE_THREADS
|
|
virtual bool DoMessageFromThreadWait();
|
|
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);
|
|
#endif // wxUSE_THREADS
|
|
wxPortId GetToolkitVersion(int *majVer = NULL,
|
|
int *minVer = NULL,
|
|
int *microVer = NULL) const wxOVERRIDE;
|
|
|
|
virtual bool CanUseStderr();
|
|
virtual bool WriteToStderr(const wxString& text);
|
|
};
|
|
|
|
#elif defined(__WXGTK__)
|
|
|
|
class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
|
|
{
|
|
public:
|
|
virtual wxEventLoopBase *CreateEventLoop();
|
|
virtual void *BeforeChildWaitLoop() { return NULL; }
|
|
virtual void AfterChildWaitLoop(void *WXUNUSED(data)) { }
|
|
#if wxUSE_TIMER
|
|
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
|
|
#endif
|
|
|
|
#if wxUSE_THREADS && defined(__WXGTK20__)
|
|
virtual void MutexGuiEnter();
|
|
virtual void MutexGuiLeave();
|
|
#endif
|
|
|
|
#if wxUSE_THREADS
|
|
virtual bool DoMessageFromThreadWait() { return true; }
|
|
virtual WXDWORD WaitForThread(WXHANDLE hThread, int WXUNUSED(flags))
|
|
{ return DoSimpleWaitForThread(hThread); }
|
|
#endif // wxUSE_THREADS
|
|
virtual wxPortId GetToolkitVersion(int *majVer = NULL,
|
|
int *minVer = NULL,
|
|
int *microVer = NULL) const;
|
|
|
|
virtual bool CanUseStderr() { return false; }
|
|
virtual bool WriteToStderr(const wxString& WXUNUSED(text)) { return false; }
|
|
};
|
|
|
|
#endif
|
|
|
|
#endif // wxUSE_GUI
|
|
|
|
#endif // _WX_MSW_APPTRAIT_H_
|