mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-10 08:09:26 +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.
95 lines
2.8 KiB
C++
95 lines
2.8 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/mstream.h
|
|
// Purpose: Memory stream classes
|
|
// Author: Guilhem Lavaux
|
|
// Modified by:
|
|
// Created: 11/07/98
|
|
// Copyright: (c) Guilhem Lavaux
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_WXMMSTREAM_H__
|
|
#define _WX_WXMMSTREAM_H__
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_STREAMS
|
|
|
|
#include "wx/stream.h"
|
|
|
|
class WXDLLIMPEXP_FWD_BASE wxMemoryOutputStream;
|
|
|
|
class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream
|
|
{
|
|
public:
|
|
wxMemoryInputStream(const void *data, size_t length);
|
|
wxMemoryInputStream(const wxMemoryOutputStream& stream);
|
|
wxMemoryInputStream(wxInputStream& stream,
|
|
wxFileOffset lenFile = wxInvalidOffset)
|
|
{
|
|
InitFromStream(stream, lenFile);
|
|
}
|
|
wxMemoryInputStream(wxMemoryInputStream& stream)
|
|
: wxInputStream()
|
|
{
|
|
InitFromStream(stream, wxInvalidOffset);
|
|
}
|
|
|
|
virtual ~wxMemoryInputStream();
|
|
virtual wxFileOffset GetLength() const wxOVERRIDE { return m_length; }
|
|
virtual bool IsSeekable() const wxOVERRIDE { return true; }
|
|
|
|
virtual char Peek() wxOVERRIDE;
|
|
virtual bool CanRead() const wxOVERRIDE;
|
|
|
|
wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
|
|
|
|
protected:
|
|
wxStreamBuffer *m_i_streambuf;
|
|
|
|
size_t OnSysRead(void *buffer, size_t nbytes) wxOVERRIDE;
|
|
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE;
|
|
wxFileOffset OnSysTell() const wxOVERRIDE;
|
|
|
|
private:
|
|
// common part of ctors taking wxInputStream
|
|
void InitFromStream(wxInputStream& stream, wxFileOffset lenFile);
|
|
|
|
size_t m_length;
|
|
|
|
// copy ctor is implemented above: it copies the other stream in this one
|
|
wxDECLARE_ABSTRACT_CLASS(wxMemoryInputStream);
|
|
wxDECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream);
|
|
};
|
|
|
|
class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream
|
|
{
|
|
public:
|
|
// if data is !NULL it must be allocated with malloc()
|
|
wxMemoryOutputStream(void *data = NULL, size_t length = 0);
|
|
virtual ~wxMemoryOutputStream();
|
|
virtual wxFileOffset GetLength() const wxOVERRIDE { return m_o_streambuf->GetLastAccess(); }
|
|
virtual bool IsSeekable() const wxOVERRIDE { return true; }
|
|
|
|
size_t CopyTo(void *buffer, size_t len) const;
|
|
|
|
wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
|
|
|
|
protected:
|
|
wxStreamBuffer *m_o_streambuf;
|
|
|
|
protected:
|
|
size_t OnSysWrite(const void *buffer, size_t nbytes) wxOVERRIDE;
|
|
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE;
|
|
wxFileOffset OnSysTell() const wxOVERRIDE;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxMemoryOutputStream);
|
|
wxDECLARE_NO_COPY_CLASS(wxMemoryOutputStream);
|
|
};
|
|
|
|
#endif
|
|
// wxUSE_STREAMS
|
|
|
|
#endif
|
|
// _WX_WXMMSTREAM_H__
|