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.
79 lines
2 KiB
C++
79 lines
2 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/sound.h
|
|
// Purpose: wxSound class (loads and plays short Windows .wav files).
|
|
// Optional on non-Windows platforms.
|
|
// Author: Ryan Norton, Stefan Csomor
|
|
// Modified by:
|
|
// Created: 1998-01-01
|
|
// Copyright: (c) Ryan Norton, Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_SOUND_H_
|
|
#define _WX_SOUND_H_
|
|
|
|
#if wxUSE_SOUND
|
|
|
|
#include "wx/object.h"
|
|
|
|
class WXDLLIMPEXP_FWD_ADV wxSoundTimer;
|
|
|
|
class WXDLLIMPEXP_ADV wxSoundData
|
|
{
|
|
public :
|
|
wxSoundData();
|
|
virtual ~wxSoundData();
|
|
|
|
virtual bool Play(unsigned int flags) = 0;
|
|
// stops the sound and deletes the optional timer
|
|
virtual void Stop();
|
|
// mark this to be deleted
|
|
virtual void MarkForDeletion();
|
|
virtual bool IsMarkedForDeletion() const { return m_markedForDeletion; }
|
|
|
|
// does the true work of stopping and cleaning up
|
|
virtual void DoStop() = 0;
|
|
|
|
protected:
|
|
unsigned int m_flags;
|
|
bool m_markedForDeletion;
|
|
} ;
|
|
|
|
class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
|
|
{
|
|
public:
|
|
wxSound();
|
|
wxSound(const wxString& fileName, bool isResource = false);
|
|
wxSound(size_t size, const void* data);
|
|
virtual ~wxSound();
|
|
|
|
// Create from resource or file
|
|
bool Create(const wxString& fileName, bool isResource = false);
|
|
// Create from data
|
|
bool Create(size_t size, const void* data);
|
|
|
|
bool IsOk() const { return m_data != NULL; }
|
|
|
|
// Stop playing any sound
|
|
static void Stop();
|
|
|
|
// Returns true if a sound is being played
|
|
static bool IsPlaying();
|
|
|
|
// Notification when a sound has stopped
|
|
static void SoundStopped(const wxSoundData* data);
|
|
|
|
protected:
|
|
bool DoPlay(unsigned flags) const;
|
|
void Init();
|
|
|
|
private:
|
|
// data of this object
|
|
class wxSoundData *m_data;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxSound);
|
|
};
|
|
|
|
#endif
|
|
#endif
|
|
// _WX_SOUND_H_
|