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.
126 lines
3.7 KiB
C++
126 lines
3.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/animate.h
|
|
// Purpose: wxAnimation and wxAnimationCtrl
|
|
// Author: Julian Smart and Guillermo Rodriguez Garcia
|
|
// Modified by: Francesco Montorsi
|
|
// Created: 13/8/99
|
|
// Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_ANIMATE_H_
|
|
#define _WX_ANIMATE_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_ANIMATIONCTRL
|
|
|
|
#include "wx/animdecod.h"
|
|
#include "wx/control.h"
|
|
#include "wx/timer.h"
|
|
#include "wx/bitmap.h"
|
|
|
|
class WXDLLIMPEXP_FWD_ADV wxAnimation;
|
|
|
|
extern WXDLLIMPEXP_DATA_ADV(wxAnimation) wxNullAnimation;
|
|
extern WXDLLIMPEXP_DATA_ADV(const char) wxAnimationCtrlNameStr[];
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxAnimationBase
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_ADV wxAnimationBase : public wxObject
|
|
{
|
|
public:
|
|
wxAnimationBase() {}
|
|
|
|
virtual bool IsOk() const = 0;
|
|
|
|
// can be -1
|
|
virtual int GetDelay(unsigned int frame) const = 0;
|
|
|
|
virtual unsigned int GetFrameCount() const = 0;
|
|
virtual wxImage GetFrame(unsigned int frame) const = 0;
|
|
virtual wxSize GetSize() const = 0;
|
|
|
|
virtual bool LoadFile(const wxString& name,
|
|
wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
|
|
virtual bool Load(wxInputStream& stream,
|
|
wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
|
|
|
|
protected:
|
|
wxDECLARE_ABSTRACT_CLASS(wxAnimationBase);
|
|
};
|
|
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxAnimationCtrlBase
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// do not autoresize to the animation's size when SetAnimation() is called
|
|
#define wxAC_NO_AUTORESIZE (0x0010)
|
|
|
|
// default style does not include wxAC_NO_AUTORESIZE, that is, the control
|
|
// auto-resizes by default to fit the new animation when SetAnimation() is called
|
|
#define wxAC_DEFAULT_STYLE (wxBORDER_NONE)
|
|
|
|
class WXDLLIMPEXP_ADV wxAnimationCtrlBase : public wxControl
|
|
{
|
|
public:
|
|
wxAnimationCtrlBase() { }
|
|
|
|
// public API
|
|
virtual bool LoadFile(const wxString& filename,
|
|
wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
|
|
virtual bool Load(wxInputStream& stream,
|
|
wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
|
|
|
|
virtual void SetAnimation(const wxAnimation &anim) = 0;
|
|
virtual wxAnimation GetAnimation() const = 0;
|
|
|
|
virtual bool Play() = 0;
|
|
virtual void Stop() = 0;
|
|
|
|
virtual bool IsPlaying() const = 0;
|
|
|
|
virtual void SetInactiveBitmap(const wxBitmap &bmp);
|
|
|
|
// always return the original bitmap set in this control
|
|
wxBitmap GetInactiveBitmap() const
|
|
{ return m_bmpStatic; }
|
|
|
|
protected:
|
|
// the inactive bitmap as it was set by the user
|
|
wxBitmap m_bmpStatic;
|
|
|
|
// the inactive bitmap currently shown in the control
|
|
// (may differ in the size from m_bmpStatic)
|
|
wxBitmap m_bmpStaticReal;
|
|
|
|
// updates m_bmpStaticReal from m_bmpStatic if needed
|
|
virtual void UpdateStaticImage();
|
|
|
|
// called by SetInactiveBitmap
|
|
virtual void DisplayStaticImage() = 0;
|
|
|
|
private:
|
|
wxDECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase);
|
|
};
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// include the platform-specific version of the wxAnimationCtrl class
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
|
|
#include "wx/gtk/animate.h"
|
|
#else
|
|
#include "wx/generic/animate.h"
|
|
#endif
|
|
|
|
#endif // wxUSE_ANIMATIONCTRL
|
|
|
|
#endif // _WX_ANIMATE_H_
|