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.
68 lines
2.4 KiB
C++
68 lines
2.4 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/unix/apptbase.h
|
|
// Purpose: declaration of wxAppTraits for Unix systems
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 23.06.2003
|
|
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_UNIX_APPTBASE_H_
|
|
#define _WX_UNIX_APPTBASE_H_
|
|
|
|
#include "wx/evtloop.h"
|
|
#include "wx/evtloopsrc.h"
|
|
|
|
class wxExecuteData;
|
|
class wxFDIOManager;
|
|
class wxEventLoopSourcesManagerBase;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxAppTraits: the Unix version adds extra hooks needed by Unix code
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
|
|
{
|
|
public:
|
|
// wxExecute() support methods
|
|
// ---------------------------
|
|
|
|
// Wait for the process termination and return its exit code or -1 on error.
|
|
//
|
|
// Notice that this is only used when execData.flags contains wxEXEC_SYNC
|
|
// and does not contain wxEXEC_NOEVENTS, i.e. when we need to really wait
|
|
// until the child process exit and dispatch the events while doing it.
|
|
virtual int WaitForChild(wxExecuteData& execData);
|
|
|
|
#if wxUSE_SOCKETS
|
|
// return a pointer to the object which should be used to integrate
|
|
// monitoring of the file descriptors to the event loop (currently this is
|
|
// used for the sockets only but should be used for arbitrary event loop
|
|
// sources in the future)
|
|
//
|
|
// this object may be different for the console and GUI applications
|
|
//
|
|
// the pointer is not deleted by the caller as normally it points to a
|
|
// static variable
|
|
virtual wxFDIOManager *GetFDIOManager();
|
|
#endif // wxUSE_SOCKETS
|
|
|
|
#if wxUSE_EVENTLOOP_SOURCE
|
|
// Return a non-NULL pointer to the object responsible for managing the
|
|
// event loop sources in this kind of application.
|
|
virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager();
|
|
#endif // wxUSE_CONSOLE_EVENTLOOP
|
|
|
|
protected:
|
|
// Wait for the process termination by running the given event loop until
|
|
// this happens.
|
|
//
|
|
// This is used by the public WaitForChild() after creating the event loop
|
|
// of the appropriate kind.
|
|
int RunLoopUntilChildExit(wxExecuteData& execData, wxEventLoopBase& loop);
|
|
};
|
|
|
|
#endif // _WX_UNIX_APPTBASE_H_
|
|
|