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.
60 lines
2.1 KiB
C++
60 lines
2.1 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/imagtiff.h
|
|
// Purpose: wxImage TIFF handler
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) Robert Roebling
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_IMAGTIFF_H_
|
|
#define _WX_IMAGTIFF_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxTIFFHandler
|
|
//-----------------------------------------------------------------------------
|
|
|
|
#if wxUSE_LIBTIFF
|
|
|
|
#include "wx/image.h"
|
|
#include "wx/versioninfo.h"
|
|
|
|
// defines for wxImage::SetOption
|
|
#define wxIMAGE_OPTION_TIFF_BITSPERSAMPLE wxString(wxT("BitsPerSample"))
|
|
#define wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL wxString(wxT("SamplesPerPixel"))
|
|
#define wxIMAGE_OPTION_TIFF_COMPRESSION wxString(wxT("Compression"))
|
|
#define wxIMAGE_OPTION_TIFF_PHOTOMETRIC wxString(wxT("Photometric"))
|
|
#define wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR wxString(wxT("ImageDescriptor"))
|
|
|
|
// for backwards compatibility
|
|
#define wxIMAGE_OPTION_BITSPERSAMPLE wxIMAGE_OPTION_TIFF_BITSPERSAMPLE
|
|
#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL
|
|
#define wxIMAGE_OPTION_COMPRESSION wxIMAGE_OPTION_TIFF_COMPRESSION
|
|
#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR
|
|
|
|
class WXDLLIMPEXP_CORE wxTIFFHandler: public wxImageHandler
|
|
{
|
|
public:
|
|
wxTIFFHandler();
|
|
|
|
static wxVersionInfo GetLibraryVersionInfo();
|
|
|
|
#if wxUSE_STREAMS
|
|
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ) wxOVERRIDE;
|
|
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ) wxOVERRIDE;
|
|
|
|
protected:
|
|
virtual int DoGetImageCount( wxInputStream& stream ) wxOVERRIDE;
|
|
virtual bool DoCanRead( wxInputStream& stream ) wxOVERRIDE;
|
|
#endif
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxTIFFHandler);
|
|
};
|
|
|
|
#endif // wxUSE_LIBTIFF
|
|
|
|
#endif // _WX_IMAGTIFF_H_
|
|
|