mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 20:31:50 +02: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.
65 lines
2.2 KiB
C
65 lines
2.2 KiB
C
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/encinfo.h
|
|
// Purpose: declares wxNativeEncodingInfo struct
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 19.09.2003 (extracted from wx/fontenc.h)
|
|
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_ENCINFO_H_
|
|
#define _WX_ENCINFO_H_
|
|
|
|
#include "wx/string.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxNativeEncodingInfo contains all encoding parameters for this platform
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// This private structure specifies all the parameters needed to create a font
|
|
// with the given encoding on this platform.
|
|
//
|
|
// Under X, it contains the last 2 elements of the font specifications
|
|
// (registry and encoding).
|
|
//
|
|
// Under Windows, it contains a number which is one of predefined CHARSET_XXX
|
|
// values.
|
|
//
|
|
// Under all platforms it also contains a facename string which should be
|
|
// used, if not empty, to create fonts in this encoding (this is the only way
|
|
// to create a font of non-standard encoding (like KOI8) under Windows - the
|
|
// facename specifies the encoding then)
|
|
|
|
struct WXDLLIMPEXP_CORE wxNativeEncodingInfo
|
|
{
|
|
wxString facename; // may be empty meaning "any"
|
|
wxFontEncoding encoding; // so that we know what this struct represents
|
|
|
|
#if defined(__WXMSW__) || \
|
|
defined(__WXMAC__) || \
|
|
defined(__WXQT__)
|
|
|
|
wxNativeEncodingInfo()
|
|
: facename()
|
|
, encoding(wxFONTENCODING_SYSTEM)
|
|
, charset(0) /* ANSI_CHARSET */
|
|
{ }
|
|
|
|
int charset;
|
|
#elif defined(_WX_X_FONTLIKE)
|
|
wxString xregistry,
|
|
xencoding;
|
|
#elif defined(wxHAS_UTF8_FONTS)
|
|
// ports using UTF-8 for text don't need encoding information for fonts
|
|
#else
|
|
#error "Unsupported toolkit"
|
|
#endif
|
|
// this struct is saved in config by wxFontMapper, so it should know to
|
|
// serialise itself (implemented in platform-specific code)
|
|
bool FromString(const wxString& s);
|
|
wxString ToString() const;
|
|
};
|
|
|
|
#endif // _WX_ENCINFO_H_
|
|
|