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.
61 lines
1.8 KiB
C++
61 lines
1.8 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/textfile.h
|
|
// Purpose: class wxTextFile to work with text files of _small_ size
|
|
// (file is fully loaded in memory) and which understands CR/LF
|
|
// differences between platforms.
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 03.04.98
|
|
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_TEXTFILE_H
|
|
#define _WX_TEXTFILE_H
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#include "wx/textbuf.h"
|
|
|
|
#if wxUSE_TEXTFILE
|
|
|
|
#include "wx/file.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxTextFile
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_BASE wxTextFile : public wxTextBuffer
|
|
{
|
|
public:
|
|
// constructors
|
|
wxTextFile() { }
|
|
wxTextFile(const wxString& strFileName);
|
|
|
|
protected:
|
|
// implement the base class pure virtuals
|
|
virtual bool OnExists() const wxOVERRIDE;
|
|
virtual bool OnOpen(const wxString &strBufferName,
|
|
wxTextBufferOpenMode openMode) wxOVERRIDE;
|
|
virtual bool OnClose() wxOVERRIDE;
|
|
virtual bool OnRead(const wxMBConv& conv) wxOVERRIDE;
|
|
virtual bool OnWrite(wxTextFileType typeNew, const wxMBConv& conv) wxOVERRIDE;
|
|
|
|
private:
|
|
|
|
wxFile m_file;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxTextFile);
|
|
};
|
|
|
|
#else // !wxUSE_TEXTFILE
|
|
|
|
// old code relies on the static methods of wxTextFile being always available
|
|
// and they still are available in wxTextBuffer (even if !wxUSE_TEXTBUFFER), so
|
|
// make it possible to use them in a backwards compatible way
|
|
typedef wxTextBuffer wxTextFile;
|
|
|
|
#endif // wxUSE_TEXTFILE/!wxUSE_TEXTFILE
|
|
|
|
#endif // _WX_TEXTFILE_H
|
|
|