mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 09:39: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.
91 lines
3.6 KiB
C
91 lines
3.6 KiB
C
/*
|
|
* Name: wx/version.h
|
|
* Purpose: wxWidgets version numbers
|
|
* Author: Julian Smart
|
|
* Modified by: Ryan Norton (Converted to C)
|
|
* Created: 29/01/98
|
|
* Copyright: (c) 1998 Julian Smart
|
|
* Licence: wxWindows licence
|
|
*/
|
|
|
|
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
|
|
|
|
#ifndef _WX_VERSION_H_
|
|
#define _WX_VERSION_H_
|
|
|
|
#include "wx/cpp.h" /* for wxSTRINGIZE */
|
|
|
|
/* the constants below must be changed with each new version */
|
|
/* ---------------------------------------------------------------------------- */
|
|
|
|
/*
|
|
Don't forget to update WX_CURRENT, WX_REVISION and WX_AGE in
|
|
build/bakefiles/version.bkl and regenerate the makefiles when you change
|
|
this!
|
|
*/
|
|
|
|
/* NB: this file is parsed by automatic tools so don't change its format! */
|
|
#define wxMAJOR_VERSION 3
|
|
#define wxMINOR_VERSION 1
|
|
#define wxRELEASE_NUMBER 1
|
|
#define wxSUBRELEASE_NUMBER 0
|
|
#define wxVERSION_STRING wxT("wxWidgets 3.1.1")
|
|
|
|
/* nothing to update below this line when updating the version */
|
|
/* ---------------------------------------------------------------------------- */
|
|
|
|
/* Users can pre-define wxABI_VERSION to a lower value in their
|
|
* makefile/project settings to compile code that will be binary compatible
|
|
* with earlier versions of the ABI within the same minor version (between
|
|
* minor versions binary compatibility breaks anyway). The default is the
|
|
* version of wxWidgets being used. A single number with two decimal digits
|
|
* for each component, e.g. 20601 for 2.6.1 */
|
|
#ifndef wxABI_VERSION
|
|
#define wxABI_VERSION ( wxMAJOR_VERSION * 10000 + wxMINOR_VERSION * 100 + 99 )
|
|
#endif
|
|
|
|
/* helpers for wxVERSION_NUM_XXX */
|
|
#define wxMAKE_VERSION_STRING(x, y, z) \
|
|
wxSTRINGIZE(x) wxSTRINGIZE(y) wxSTRINGIZE(z)
|
|
#define wxMAKE_VERSION_DOT_STRING(x, y, z) \
|
|
wxSTRINGIZE(x) "." wxSTRINGIZE(y) "." wxSTRINGIZE(z)
|
|
|
|
#define wxMAKE_VERSION_STRING_T(x, y, z) \
|
|
wxSTRINGIZE_T(x) wxSTRINGIZE_T(y) wxSTRINGIZE_T(z)
|
|
#define wxMAKE_VERSION_DOT_STRING_T(x, y, z) \
|
|
wxSTRINGIZE_T(x) wxT(".") wxSTRINGIZE_T(y) wxT(".") wxSTRINGIZE_T(z)
|
|
|
|
/* these are used by src/msw/version.rc and should always be ASCII, not Unicode */
|
|
#define wxVERSION_NUM_STRING \
|
|
wxMAKE_VERSION_STRING(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER)
|
|
#define wxVERSION_NUM_DOT_STRING \
|
|
wxMAKE_VERSION_DOT_STRING(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER)
|
|
|
|
/* those are Unicode-friendly */
|
|
#define wxVERSION_NUM_STRING_T \
|
|
wxMAKE_VERSION_STRING_T(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER)
|
|
#define wxVERSION_NUM_DOT_STRING_T \
|
|
wxMAKE_VERSION_DOT_STRING_T(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER)
|
|
|
|
/* some more defines, not really sure if they're [still] useful */
|
|
#define wxVERSION_NUMBER ( (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER )
|
|
#define wxBETA_NUMBER 0
|
|
#define wxVERSION_FLOAT ( wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0) )
|
|
|
|
/* check if the current version is at least major.minor.release */
|
|
#define wxCHECK_VERSION(major,minor,release) \
|
|
(wxMAJOR_VERSION > (major) || \
|
|
(wxMAJOR_VERSION == (major) && wxMINOR_VERSION > (minor)) || \
|
|
(wxMAJOR_VERSION == (major) && wxMINOR_VERSION == (minor) && wxRELEASE_NUMBER >= (release)))
|
|
|
|
/* the same but check the subrelease also */
|
|
#define wxCHECK_VERSION_FULL(major,minor,release,subrel) \
|
|
(wxCHECK_VERSION(major, minor, release) && \
|
|
((major) != wxMAJOR_VERSION || \
|
|
(minor) != wxMINOR_VERSION || \
|
|
(release) != wxRELEASE_NUMBER || \
|
|
(subrel) <= wxSUBRELEASE_NUMBER))
|
|
|
|
#endif /* _WX_VERSION_H_ */
|
|
|