mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 17:49:14 +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.
57 lines
1.3 KiB
C++
57 lines
1.3 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/meta/if.h
|
|
// Purpose: declares wxIf<> metaprogramming construct
|
|
// Author: Vaclav Slavik
|
|
// Created: 2008-01-22
|
|
// Copyright: (c) 2008 Vaclav Slavik
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_META_IF_H_
|
|
#define _WX_META_IF_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
namespace wxPrivate
|
|
{
|
|
|
|
template <bool Cond>
|
|
struct wxIfImpl;
|
|
|
|
// specialization for true:
|
|
template <>
|
|
struct wxIfImpl<true>
|
|
{
|
|
template<typename TTrue, typename TFalse> struct Result
|
|
{
|
|
typedef TTrue value;
|
|
};
|
|
};
|
|
|
|
// specialization for false:
|
|
template<>
|
|
struct wxIfImpl<false>
|
|
{
|
|
template<typename TTrue, typename TFalse> struct Result
|
|
{
|
|
typedef TFalse value;
|
|
};
|
|
};
|
|
|
|
} // namespace wxPrivate
|
|
|
|
// wxIf<> template defines nested type "value" which is the same as
|
|
// TTrue if the condition Cond (boolean compile-time constant) was met and
|
|
// TFalse if it wasn't.
|
|
//
|
|
// See wxVector<T> in vector.h for usage example
|
|
template<bool Cond, typename TTrue, typename TFalse>
|
|
struct wxIf
|
|
{
|
|
typedef typename wxPrivate::wxIfImpl<Cond>
|
|
::template Result<TTrue, TFalse>::value
|
|
value;
|
|
};
|
|
|
|
#endif // _WX_META_IF_H_
|