mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 10:39:13 +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.
78 lines
2.3 KiB
C++
78 lines
2.3 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/sound.h
|
|
// Purpose: wxSoundBase class
|
|
// Author: Vaclav Slavik
|
|
// Modified by:
|
|
// Created: 2004/02/01
|
|
// Copyright: (c) 2004, Vaclav Slavik
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_SOUND_H_BASE_
|
|
#define _WX_SOUND_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_SOUND
|
|
|
|
#include "wx/object.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxSoundBase: common wxSound code and interface
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// Flags for wxSound::Play
|
|
|
|
// NB: We can't use enum with some compilers, because they keep reporting
|
|
// nonexistent ambiguities between Play(unsigned) and static Play(const
|
|
// wxString&, unsigned).
|
|
#define wxSOUND_SYNC ((unsigned)0)
|
|
#define wxSOUND_ASYNC ((unsigned)1)
|
|
#define wxSOUND_LOOP ((unsigned)2)
|
|
|
|
// Base class for wxSound implementations
|
|
class WXDLLIMPEXP_ADV wxSoundBase : public wxObject
|
|
{
|
|
public:
|
|
// Play the sound:
|
|
bool Play(unsigned flags = wxSOUND_ASYNC) const
|
|
{
|
|
wxASSERT_MSG( (flags & wxSOUND_LOOP) == 0 ||
|
|
(flags & wxSOUND_ASYNC) != 0,
|
|
wxT("sound can only be looped asynchronously") );
|
|
return DoPlay(flags);
|
|
}
|
|
|
|
// Plays sound from filename:
|
|
static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC);
|
|
|
|
protected:
|
|
virtual bool DoPlay(unsigned flags) const = 0;
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxSound class implementation
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#if defined(__WINDOWS__)
|
|
#include "wx/msw/sound.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/sound.h"
|
|
#elif defined(__UNIX__)
|
|
#include "wx/unix/sound.h"
|
|
#endif
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxSoundBase methods
|
|
// ----------------------------------------------------------------------------
|
|
|
|
inline bool wxSoundBase::Play(const wxString& filename, unsigned flags)
|
|
{
|
|
wxSound snd(filename);
|
|
return snd.IsOk() ? snd.Play(flags) : false;
|
|
}
|
|
|
|
#endif // wxUSE_SOUND
|
|
|
|
#endif // _WX_SOUND_H_BASE_
|