mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 17:49:14 +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.
63 lines
2.0 KiB
C++
63 lines
2.0 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/icon.h
|
|
// Purpose: wxIcon implementation for ports where it's same as wxBitmap
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 17/09/98
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GENERIC_ICON_H_
|
|
#define _WX_GENERIC_ICON_H_
|
|
|
|
#include "wx/bitmap.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxIcon
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxIcon: public wxBitmap
|
|
{
|
|
public:
|
|
wxIcon();
|
|
|
|
wxIcon(const char* const* bits);
|
|
#ifdef wxNEEDS_CHARPP
|
|
wxIcon(char **bits);
|
|
#endif
|
|
|
|
// For compatibility with wxMSW where desired size is sometimes required to
|
|
// distinguish between multiple icons in a resource.
|
|
wxIcon( const wxString& filename,
|
|
wxBitmapType type = wxICON_DEFAULT_TYPE,
|
|
int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
|
|
wxBitmap(filename, type)
|
|
{
|
|
}
|
|
|
|
wxIcon(const wxIconLocation& loc)
|
|
: wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
|
|
{
|
|
}
|
|
|
|
bool LoadFile(const wxString& name, wxBitmapType flags,
|
|
int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
|
|
{ return wxBitmap::LoadFile(name, flags); }
|
|
|
|
// unhide the base class version
|
|
virtual bool LoadFile(const wxString& name,
|
|
wxBitmapType flags = wxICON_DEFAULT_TYPE) wxOVERRIDE
|
|
{ return wxBitmap::LoadFile(name, flags); }
|
|
|
|
// create from bitmap (which should have a mask unless it's monochrome):
|
|
// there shouldn't be any implicit bitmap -> icon conversion (i.e. no
|
|
// ctors, assignment operators...), but it's ok to have such function
|
|
void CopyFromBitmap(const wxBitmap& bmp);
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxIcon);
|
|
};
|
|
|
|
#endif // _WX_GENERIC_ICON_H_
|