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.
96 lines
3.1 KiB
C++
96 lines
3.1 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/unix/apptrait.h
|
|
// Purpose: standard implementations of wxAppTraits for Unix
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 23.06.2003
|
|
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_UNIX_APPTRAIT_H_
|
|
#define _WX_UNIX_APPTRAIT_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
|
|
{
|
|
public:
|
|
#if wxUSE_CONSOLE_EVENTLOOP
|
|
virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE;
|
|
#endif // wxUSE_CONSOLE_EVENTLOOP
|
|
#if wxUSE_TIMER
|
|
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE;
|
|
#endif
|
|
};
|
|
|
|
#if wxUSE_GUI
|
|
|
|
// GTK+ and Motif integrate sockets and child processes monitoring directly in
|
|
// their main loop, the other Unix ports do it at wxEventLoop level and so use
|
|
// the non-GUI traits and don't need anything here
|
|
//
|
|
// TODO: Should we use XtAddInput() for wxX11 too? Or, vice versa, if there is
|
|
// no advantage in doing this compared to the generic way currently used
|
|
// by wxX11, should we continue to use GTK/Motif-specific stuff?
|
|
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXQT__)
|
|
#define wxHAS_GUI_FDIOMANAGER
|
|
#define wxHAS_GUI_PROCESS_CALLBACKS
|
|
#endif // ports using wxFDIOManager
|
|
|
|
#if defined(__WXMAC__)
|
|
#define wxHAS_GUI_PROCESS_CALLBACKS
|
|
#define wxHAS_GUI_SOCKET_MANAGER
|
|
#endif
|
|
|
|
class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
|
|
{
|
|
public:
|
|
virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE;
|
|
virtual int WaitForChild(wxExecuteData& execData) wxOVERRIDE;
|
|
#if wxUSE_TIMER
|
|
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE;
|
|
#endif
|
|
#if wxUSE_THREADS && defined(__WXGTK20__)
|
|
virtual void MutexGuiEnter() wxOVERRIDE;
|
|
virtual void MutexGuiLeave() wxOVERRIDE;
|
|
#endif
|
|
|
|
wxPortId GetToolkitVersion(int *majVer = NULL,
|
|
int *minVer = NULL,
|
|
int *microVer = NULL) const wxOVERRIDE;
|
|
|
|
#ifdef __WXGTK20__
|
|
virtual wxString GetDesktopEnvironment() const wxOVERRIDE;
|
|
virtual wxString GetStandardCmdLineOptions(wxArrayString& names,
|
|
wxArrayString& desc) const wxOVERRIDE;
|
|
#endif // __WXGTK20____
|
|
|
|
#if defined(__WXGTK20__)
|
|
virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE;
|
|
#endif
|
|
|
|
#if wxUSE_SOCKETS
|
|
|
|
#ifdef wxHAS_GUI_SOCKET_MANAGER
|
|
virtual wxSocketManager *GetSocketManager() wxOVERRIDE;
|
|
#endif
|
|
|
|
#ifdef wxHAS_GUI_FDIOMANAGER
|
|
virtual wxFDIOManager *GetFDIOManager() wxOVERRIDE;
|
|
#endif
|
|
|
|
#endif // wxUSE_SOCKETS
|
|
|
|
#if wxUSE_EVENTLOOP_SOURCE
|
|
virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager() wxOVERRIDE;
|
|
#endif
|
|
};
|
|
|
|
#endif // wxUSE_GUI
|
|
|
|
#endif // _WX_UNIX_APPTRAIT_H_
|
|
|