mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-14 10:09: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.
62 lines
1.9 KiB
C++
62 lines
1.9 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/imaglist.h
|
|
// Purpose:
|
|
// Author: Robert Roebling, Stefan Csomor
|
|
// Created: 01/02/97
|
|
// Id:
|
|
// Copyright: (c) 1998 Robert Roebling and Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_IMAGLIST_H_
|
|
#define _WX_IMAGLIST_H_
|
|
|
|
#include "wx/defs.h"
|
|
#include "wx/list.h"
|
|
#include "wx/icon.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxDC;
|
|
class WXDLLIMPEXP_FWD_CORE wxBitmap;
|
|
class WXDLLIMPEXP_FWD_CORE wxColour;
|
|
|
|
class WXDLLIMPEXP_CORE wxImageList: public wxObject
|
|
{
|
|
public:
|
|
wxImageList() { m_width = m_height = 0; }
|
|
wxImageList( int width, int height, bool mask = true, int initialCount = 1 );
|
|
virtual ~wxImageList();
|
|
bool Create( int width, int height, bool mask = true, int initialCount = 1 );
|
|
bool Create();
|
|
|
|
virtual int GetImageCount() const;
|
|
virtual bool GetSize( int index, int &width, int &height ) const;
|
|
virtual wxSize GetSize() const { return wxSize(m_width, m_height); }
|
|
|
|
int Add( const wxIcon& bitmap );
|
|
int Add( const wxBitmap& bitmap );
|
|
int Add( const wxBitmap& bitmap, const wxBitmap& mask );
|
|
int Add( const wxBitmap& bitmap, const wxColour& maskColour );
|
|
wxBitmap GetBitmap(int index) const;
|
|
wxIcon GetIcon(int index) const;
|
|
bool Replace( int index, const wxIcon &bitmap );
|
|
bool Replace( int index, const wxBitmap &bitmap );
|
|
bool Replace( int index, const wxBitmap &bitmap, const wxBitmap &mask );
|
|
bool Remove( int index );
|
|
bool RemoveAll();
|
|
|
|
virtual bool Draw(int index, wxDC& dc, int x, int y,
|
|
int flags = wxIMAGELIST_DRAW_NORMAL,
|
|
bool solidBackground = false);
|
|
|
|
private:
|
|
wxList m_images;
|
|
|
|
int m_width;
|
|
int m_height;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxImageList);
|
|
};
|
|
|
|
#endif // _WX_IMAGLIST_H_
|
|
|