mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-19 12:31:17 +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.
76 lines
2.2 KiB
C++
76 lines
2.2 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/x11/palette.h
|
|
// Purpose: wxPalette class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 17/09/98
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_PALETTE_H_
|
|
#define _WX_PALETTE_H_
|
|
|
|
#include "wx/list.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxPalette;
|
|
|
|
// Palette for one display
|
|
class wxXPalette : public wxObject
|
|
{
|
|
wxDECLARE_DYNAMIC_CLASS(wxXPalette);
|
|
|
|
public:
|
|
wxXPalette();
|
|
|
|
WXDisplay* m_display;
|
|
int m_pix_array_n;
|
|
unsigned char* m_red;
|
|
unsigned char* m_green;
|
|
unsigned char* m_blue;
|
|
unsigned long* m_pix_array;
|
|
WXColormap m_cmap;
|
|
bool m_destroyable;
|
|
};
|
|
|
|
class WXDLLIMPEXP_CORE wxPaletteRefData: public wxGDIRefData
|
|
{
|
|
friend class WXDLLIMPEXP_FWD_CORE wxPalette;
|
|
public:
|
|
wxPaletteRefData();
|
|
virtual ~wxPaletteRefData();
|
|
|
|
protected:
|
|
wxList m_palettes;
|
|
};
|
|
|
|
#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
|
|
|
|
class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase
|
|
{
|
|
wxDECLARE_DYNAMIC_CLASS(wxPalette);
|
|
|
|
public:
|
|
wxPalette();
|
|
|
|
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
|
virtual ~wxPalette();
|
|
bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
|
int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
|
|
bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
|
|
|
|
// X-specific
|
|
WXColormap GetXColormap(WXDisplay* display = NULL) const;
|
|
bool TransferBitmap(void *data, int depth, int size);
|
|
bool TransferBitmap8(unsigned char *data, unsigned long size, void *dest, unsigned int bpp);
|
|
unsigned long *GetXPixArray(WXDisplay* display, int *pix_array_n);
|
|
void PutXColormap(WXDisplay* display, WXColormap cmap, bool destroyable);
|
|
virtual int GetColoursCount() const wxOVERRIDE;
|
|
|
|
protected:
|
|
virtual wxGDIRefData *CreateGDIRefData() const;
|
|
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
|
};
|
|
|
|
#endif // _WX_PALETTE_H_
|