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.
76 lines
2.4 KiB
C
76 lines
2.4 KiB
C
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/time.h
|
|
// Purpose: Miscellaneous time-related functions.
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2011-11-26
|
|
// Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_TIME_H_
|
|
#define _WX_TIME_H_
|
|
|
|
#include "wx/longlong.h"
|
|
|
|
// Returns the difference between UTC and local time in seconds.
|
|
WXDLLIMPEXP_BASE int wxGetTimeZone();
|
|
|
|
// Get number of seconds since local time 00:00:00 Jan 1st 1970.
|
|
extern long WXDLLIMPEXP_BASE wxGetLocalTime();
|
|
|
|
// Get number of seconds since GMT 00:00:00, Jan 1st 1970.
|
|
extern long WXDLLIMPEXP_BASE wxGetUTCTime();
|
|
|
|
#if wxUSE_LONGLONG
|
|
typedef wxLongLong wxMilliClock_t;
|
|
inline long wxMilliClockToLong(wxLongLong ll) { return ll.ToLong(); }
|
|
#else
|
|
typedef double wxMilliClock_t;
|
|
inline long wxMilliClockToLong(double d) { return wx_truncate_cast(long, d); }
|
|
#endif // wxUSE_LONGLONG
|
|
|
|
// Get number of milliseconds since local time 00:00:00 Jan 1st 1970
|
|
extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis();
|
|
|
|
#if wxUSE_LONGLONG
|
|
|
|
// Get the number of milliseconds or microseconds since the Epoch.
|
|
wxLongLong WXDLLIMPEXP_BASE wxGetUTCTimeMillis();
|
|
wxLongLong WXDLLIMPEXP_BASE wxGetUTCTimeUSec();
|
|
|
|
#endif // wxUSE_LONGLONG
|
|
|
|
#define wxGetCurrentTime() wxGetLocalTime()
|
|
|
|
// on some really old systems gettimeofday() doesn't have the second argument,
|
|
// define wxGetTimeOfDay() to hide this difference
|
|
#ifdef HAVE_GETTIMEOFDAY
|
|
#ifdef WX_GETTIMEOFDAY_NO_TZ
|
|
#define wxGetTimeOfDay(tv) gettimeofday(tv)
|
|
#else
|
|
#define wxGetTimeOfDay(tv) gettimeofday((tv), NULL)
|
|
#endif
|
|
#endif // HAVE_GETTIMEOFDAY
|
|
|
|
/* Two wrapper functions for thread safety */
|
|
#ifdef HAVE_LOCALTIME_R
|
|
#define wxLocaltime_r localtime_r
|
|
#else
|
|
WXDLLIMPEXP_BASE struct tm *wxLocaltime_r(const time_t*, struct tm*);
|
|
#if wxUSE_THREADS && !defined(__WINDOWS__)
|
|
// On Windows, localtime _is_ threadsafe!
|
|
#warning using pseudo thread-safe wrapper for localtime to emulate localtime_r
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef HAVE_GMTIME_R
|
|
#define wxGmtime_r gmtime_r
|
|
#else
|
|
WXDLLIMPEXP_BASE struct tm *wxGmtime_r(const time_t*, struct tm*);
|
|
#if wxUSE_THREADS && !defined(__WINDOWS__)
|
|
// On Windows, gmtime _is_ threadsafe!
|
|
#warning using pseudo thread-safe wrapper for gmtime to emulate gmtime_r
|
|
#endif
|
|
#endif
|
|
|
|
#endif // _WX_TIME_H_
|