mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 18:49:11 +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.
187 lines
5.9 KiB
C++
187 lines
5.9 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/bitmap.h
|
|
// Purpose:
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) 1998 Robert Roebling
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTK_BITMAP_H_
|
|
#define _WX_GTK_BITMAP_H_
|
|
|
|
#ifdef __WXGTK3__
|
|
typedef struct _cairo cairo_t;
|
|
typedef struct _cairo_surface cairo_surface_t;
|
|
#endif
|
|
typedef struct _GdkPixbuf GdkPixbuf;
|
|
class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
|
|
class WXDLLIMPEXP_FWD_CORE wxCursor;
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxMask
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxMask: public wxMaskBase
|
|
{
|
|
public:
|
|
wxMask();
|
|
wxMask(const wxMask& mask);
|
|
wxMask( const wxBitmap& bitmap, const wxColour& colour );
|
|
#if wxUSE_PALETTE
|
|
wxMask( const wxBitmap& bitmap, int paletteIndex );
|
|
#endif // wxUSE_PALETTE
|
|
wxMask( const wxBitmap& bitmap );
|
|
virtual ~wxMask();
|
|
wxBitmap GetBitmap() const;
|
|
|
|
// implementation
|
|
#ifdef __WXGTK3__
|
|
wxMask(cairo_surface_t*);
|
|
operator cairo_surface_t*() const;
|
|
#else
|
|
wxMask(GdkPixmap*);
|
|
operator GdkPixmap*() const;
|
|
#endif
|
|
|
|
protected:
|
|
virtual void FreeData() wxOVERRIDE;
|
|
virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour) wxOVERRIDE;
|
|
virtual bool InitFromMonoBitmap(const wxBitmap& bitmap) wxOVERRIDE;
|
|
|
|
private:
|
|
#ifdef __WXGTK3__
|
|
cairo_surface_t* m_bitmap;
|
|
#else
|
|
GdkPixmap* m_bitmap;
|
|
#endif
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxMask);
|
|
};
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxBitmap
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
|
|
{
|
|
public:
|
|
wxBitmap() { }
|
|
wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH )
|
|
{ Create(width, height, depth); }
|
|
wxBitmap( const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH )
|
|
{ Create(sz, depth); }
|
|
wxBitmap( const char bits[], int width, int height, int depth = 1 );
|
|
wxBitmap( const char* const* bits );
|
|
#ifdef wxNEEDS_CHARPP
|
|
// needed for old GCC
|
|
wxBitmap(char** data)
|
|
{ *this = wxBitmap(const_cast<const char* const*>(data)); }
|
|
#endif
|
|
wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
|
|
#if wxUSE_IMAGE
|
|
wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH, double scale = 1.0);
|
|
#endif // wxUSE_IMAGE
|
|
wxBitmap(GdkPixbuf* pixbuf, int depth = 0);
|
|
wxEXPLICIT wxBitmap(const wxCursor& cursor);
|
|
virtual ~wxBitmap();
|
|
|
|
bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE;
|
|
bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE
|
|
{ return Create(sz.GetWidth(), sz.GetHeight(), depth); }
|
|
bool Create(int width, int height, const wxDC& WXUNUSED(dc))
|
|
{ return Create(width,height); }
|
|
#ifdef __WXGTK3__
|
|
virtual bool CreateScaled(int w, int h, int depth, double scale) wxOVERRIDE;
|
|
virtual double GetScaleFactor() const wxOVERRIDE;
|
|
#endif
|
|
|
|
virtual int GetHeight() const wxOVERRIDE;
|
|
virtual int GetWidth() const wxOVERRIDE;
|
|
virtual int GetDepth() const wxOVERRIDE;
|
|
|
|
#if wxUSE_IMAGE
|
|
wxImage ConvertToImage() const wxOVERRIDE;
|
|
#endif // wxUSE_IMAGE
|
|
|
|
// copies the contents and mask of the given (colour) icon to the bitmap
|
|
virtual bool CopyFromIcon(const wxIcon& icon) wxOVERRIDE;
|
|
|
|
wxMask *GetMask() const wxOVERRIDE;
|
|
void SetMask( wxMask *mask ) wxOVERRIDE;
|
|
|
|
wxBitmap GetSubBitmap( const wxRect& rect ) const wxOVERRIDE;
|
|
|
|
bool SaveFile(const wxString &name, wxBitmapType type,
|
|
const wxPalette *palette = NULL) const wxOVERRIDE;
|
|
bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) wxOVERRIDE;
|
|
|
|
#if wxUSE_PALETTE
|
|
wxPalette *GetPalette() const wxOVERRIDE;
|
|
void SetPalette(const wxPalette& palette) wxOVERRIDE;
|
|
wxPalette *GetColourMap() const { return GetPalette(); }
|
|
#endif // wxUSE_PALETTE
|
|
|
|
static void InitStandardHandlers();
|
|
|
|
// implementation
|
|
// --------------
|
|
|
|
void SetHeight( int height ) wxOVERRIDE;
|
|
void SetWidth( int width ) wxOVERRIDE;
|
|
void SetDepth( int depth ) wxOVERRIDE;
|
|
|
|
#ifdef __WXGTK3__
|
|
GdkPixbuf* GetPixbufNoMask() const;
|
|
cairo_t* CairoCreate() const;
|
|
void Draw(cairo_t* cr, int x, int y, bool useMask = true, const wxColour* fg = NULL, const wxColour* bg = NULL) const;
|
|
void SetSourceSurface(cairo_t* cr, int x, int y, const wxColour* fg = NULL, const wxColour* bg = NULL) const;
|
|
#else
|
|
GdkPixmap *GetPixmap() const;
|
|
bool HasPixmap() const;
|
|
bool HasPixbuf() const;
|
|
wxBitmap(GdkPixmap* pixmap);
|
|
#endif
|
|
GdkPixbuf *GetPixbuf() const;
|
|
|
|
// raw bitmap access support functions
|
|
void *GetRawData(wxPixelDataBase& data, int bpp);
|
|
void UngetRawData(wxPixelDataBase& data);
|
|
|
|
bool HasAlpha() const;
|
|
|
|
protected:
|
|
#ifndef __WXGTK3__
|
|
#if wxUSE_IMAGE
|
|
bool CreateFromImage(const wxImage& image, int depth);
|
|
#endif // wxUSE_IMAGE
|
|
#endif
|
|
|
|
virtual wxGDIRefData* CreateGDIRefData() const wxOVERRIDE;
|
|
virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const wxOVERRIDE;
|
|
|
|
private:
|
|
#ifndef __WXGTK3__
|
|
void SetPixmap(GdkPixmap* pixmap);
|
|
#if wxUSE_IMAGE
|
|
// to be called from CreateFromImage only!
|
|
bool CreateFromImageAsPixmap(const wxImage& image, int depth);
|
|
bool CreateFromImageAsPixbuf(const wxImage& image);
|
|
#endif // wxUSE_IMAGE
|
|
|
|
public:
|
|
// implementation only
|
|
enum Representation
|
|
{
|
|
Pixmap,
|
|
Pixbuf
|
|
};
|
|
// removes other representations from memory, keeping only 'keep'
|
|
// (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf):
|
|
void PurgeOtherRepresentations(Representation keep);
|
|
#endif
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxBitmap);
|
|
};
|
|
|
|
#endif // _WX_GTK_BITMAP_H_
|