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.
71 lines
2.5 KiB
C++
71 lines
2.5 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/apptbase.h
|
|
// Purpose: declaration of wxAppTraits for MSW
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 22.06.2003
|
|
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_APPTBASE_H_
|
|
#define _WX_MSW_APPTBASE_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxAppTraits: the MSW version adds extra hooks needed by MSW-only code
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
|
|
{
|
|
public:
|
|
// wxExecute() support methods
|
|
// ---------------------------
|
|
|
|
// called before starting to wait for the child termination, may return
|
|
// some opaque data which will be passed later to AfterChildWaitLoop()
|
|
virtual void *BeforeChildWaitLoop() = 0;
|
|
|
|
// called after starting to wait for the child termination, the parameter
|
|
// is the return value of BeforeChildWaitLoop()
|
|
virtual void AfterChildWaitLoop(void *data) = 0;
|
|
|
|
|
|
#if wxUSE_THREADS
|
|
// wxThread helpers
|
|
// ----------------
|
|
|
|
// process a message while waiting for a(nother) thread, should return
|
|
// false if and only if we have to exit the application
|
|
virtual bool DoMessageFromThreadWait() = 0;
|
|
|
|
// wait for the handle to be signaled, return WAIT_OBJECT_0 if it is or, in
|
|
// the GUI code, WAIT_OBJECT_0 + 1 if a Windows message arrived
|
|
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags) = 0;
|
|
#endif // wxUSE_THREADS
|
|
|
|
|
|
// console helpers
|
|
// ---------------
|
|
|
|
// this method can be overridden by a derived class to always return true
|
|
// or false to force [not] using the console for output to stderr
|
|
//
|
|
// by default console applications always return true from here while the
|
|
// GUI ones only return true if they're being run from console and there is
|
|
// no other activity happening in this console
|
|
virtual bool CanUseStderr() = 0;
|
|
|
|
// write text to the console, return true if ok or false on error
|
|
virtual bool WriteToStderr(const wxString& text) = 0;
|
|
|
|
protected:
|
|
#if wxUSE_THREADS
|
|
// implementation of WaitForThread() for the console applications which is
|
|
// also used by the GUI code if it doesn't [yet|already] dispatch events
|
|
WXDWORD DoSimpleWaitForThread(WXHANDLE hThread);
|
|
#endif // wxUSE_THREADS
|
|
};
|
|
|
|
#endif // _WX_MSW_APPTBASE_H_
|
|
|