mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-18 12:01:15 +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.
85 lines
1.8 KiB
C++
85 lines
1.8 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/rt/utils.h
|
|
// Purpose: Windows Runtime Objects helper functions and objects
|
|
// Author: Tobias Taschner
|
|
// Created: 2015-09-05
|
|
// Copyright: (c) 2015 wxWidgets development team
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_RTUTILS_H
|
|
#define _WX_MSW_RTUTILS_H
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_WINRT
|
|
|
|
#include "wx/string.h"
|
|
#include "wx/msw/wrapwin.h"
|
|
|
|
#include <winstring.h>
|
|
|
|
namespace wxWinRT
|
|
{
|
|
|
|
bool WXDLLIMPEXP_CORE IsAvailable();
|
|
|
|
bool WXDLLIMPEXP_CORE Initialize();
|
|
|
|
void WXDLLIMPEXP_CORE Uninitialize();
|
|
|
|
bool WXDLLIMPEXP_CORE GetActivationFactory(const wxString& activatableClassId, REFIID iid, void ** factory);
|
|
|
|
// RAII class initializing WinRT in its ctor and undoing it in its dtor.
|
|
class WXDLLIMPEXP_CORE Initializer
|
|
{
|
|
public:
|
|
Initializer()
|
|
: m_ok(Initialize())
|
|
{
|
|
}
|
|
|
|
bool IsOk() const
|
|
{
|
|
return m_ok;
|
|
}
|
|
|
|
~Initializer()
|
|
{
|
|
if (m_ok)
|
|
Uninitialize();
|
|
}
|
|
|
|
private:
|
|
const bool m_ok;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(Initializer);
|
|
};
|
|
|
|
// Simple class to convert wxString to HSTRING
|
|
// This just wraps a reference to the wxString object,
|
|
// which needs a life time greater than the TempStringRef object
|
|
class WXDLLIMPEXP_CORE TempStringRef
|
|
{
|
|
public:
|
|
HSTRING Get() const { return m_hstring; }
|
|
|
|
operator HSTRING() const { return m_hstring; };
|
|
|
|
static const TempStringRef Make(const wxString &str);
|
|
|
|
private:
|
|
TempStringRef(const wxString &str);
|
|
|
|
HSTRING m_hstring;
|
|
HSTRING_HEADER m_header;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(TempStringRef);
|
|
};
|
|
|
|
} // namespace wxWinRT
|
|
|
|
#endif // wxUSE_WINRT
|
|
|
|
#endif // _WX_MSW_RTUTILS_H
|