mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-12 09:09:12 +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.
61 lines
1.9 KiB
C++
61 lines
1.9 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/activityindicator.h
|
|
// Purpose: wxActivityIndicator declaration.
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2015-03-05
|
|
// Copyright: (c) 2015 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_ACTIVITYINDICATOR_H_
|
|
#define _WX_ACTIVITYINDICATOR_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_ACTIVITYINDICATOR
|
|
|
|
#include "wx/control.h"
|
|
|
|
#define wxActivityIndicatorNameStr wxS("activityindicator")
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxActivityIndicator: small animated indicator of some application activity.
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_ADV wxActivityIndicatorBase : public wxControl
|
|
{
|
|
public:
|
|
// Start or stop the activity animation (it is stopped initially).
|
|
virtual void Start() = 0;
|
|
virtual void Stop() = 0;
|
|
|
|
// Return true if the control is currently showing activity.
|
|
virtual bool IsRunning() const = 0;
|
|
|
|
// Override some base class virtual methods.
|
|
virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
|
|
virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
|
|
|
|
protected:
|
|
// choose the default border for this window
|
|
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
|
};
|
|
|
|
#ifndef __WXUNIVERSAL__
|
|
#if defined(__WXGTK220__)
|
|
#define wxHAS_NATIVE_ACTIVITYINDICATOR
|
|
#include "wx/gtk/activityindicator.h"
|
|
#elif defined(__WXOSX_COCOA__)
|
|
#define wxHAS_NATIVE_ACTIVITYINDICATOR
|
|
#include "wx/osx/activityindicator.h"
|
|
#endif
|
|
#endif // !__WXUNIVERSAL__
|
|
|
|
#ifndef wxHAS_NATIVE_ACTIVITYINDICATOR
|
|
#include "wx/generic/activityindicator.h"
|
|
#endif
|
|
|
|
#endif // wxUSE_ACTIVITYINDICATOR
|
|
|
|
#endif // _WX_ACTIVITYINDICATOR_H_
|