mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 12:21:41 +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.
66 lines
2.4 KiB
C++
66 lines
2.4 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/activityindicator.h
|
|
// Purpose: Declaration of wxActivityIndicator for wxGTK.
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2015-03-05
|
|
// Copyright: (c) 2015 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTK_ACTIVITYINDICATOR_H_
|
|
#define _WX_GTK_ACTIVITYINDICATOR_H_
|
|
|
|
// With GTK+ 3 we can always be certain that this control is available, so use
|
|
// the normal base class. With GTK+ 2 however, we may determine during run-time
|
|
// that we need to fall back to the generic implementation because the GTK+
|
|
// version is earlier than 2.20, so we need to inherit from the generic class.
|
|
#ifdef __WXGTK3__
|
|
#define wxActivityIndicatorGtkBase wxActivityIndicatorBase
|
|
#else
|
|
#include "wx/generic/activityindicator.h"
|
|
|
|
#define wxActivityIndicatorGtkBase wxActivityIndicatorGeneric
|
|
#endif
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxActivityIndicator: implementation using GtkSpinner.
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_ADV wxActivityIndicator : public wxActivityIndicatorGtkBase
|
|
{
|
|
public:
|
|
wxActivityIndicator()
|
|
{
|
|
}
|
|
|
|
explicit
|
|
wxActivityIndicator(wxWindow* parent,
|
|
wxWindowID winid = wxID_ANY,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxActivityIndicatorNameStr)
|
|
{
|
|
Create(parent, winid, pos, size, style, name);
|
|
}
|
|
|
|
bool Create(wxWindow* parent,
|
|
wxWindowID winid = wxID_ANY,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxString& name = wxActivityIndicatorNameStr);
|
|
|
|
virtual void Start() wxOVERRIDE;
|
|
virtual void Stop() wxOVERRIDE;
|
|
virtual bool IsRunning() const wxOVERRIDE;
|
|
|
|
protected:
|
|
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxActivityIndicator);
|
|
wxDECLARE_NO_COPY_CLASS(wxActivityIndicator);
|
|
};
|
|
|
|
#endif // _WX_GTK_ACTIVITYINDICATOR_H_
|