mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 09:39: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.
101 lines
3.0 KiB
C++
101 lines
3.0 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/icon.h
|
|
// Purpose: wxIcon class
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 1998-01-01
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_ICON_H_
|
|
#define _WX_ICON_H_
|
|
|
|
#include "wx/bitmap.h"
|
|
|
|
// Icon
|
|
class WXDLLIMPEXP_CORE wxIcon : public wxGDIObject
|
|
{
|
|
public:
|
|
wxIcon();
|
|
|
|
wxIcon(const char* const* data);
|
|
wxIcon(const char bits[], int width , int height );
|
|
wxIcon(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE,
|
|
int desiredWidth = -1, int desiredHeight = -1);
|
|
wxIcon(const wxIconLocation& loc)
|
|
{
|
|
LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
|
|
}
|
|
|
|
wxIcon(WXHICON icon, const wxSize& size);
|
|
|
|
virtual ~wxIcon();
|
|
|
|
bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE,
|
|
int desiredWidth = -1, int desiredHeight = -1);
|
|
|
|
|
|
// 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);
|
|
|
|
int GetWidth() const;
|
|
int GetHeight() const;
|
|
int GetDepth() const;
|
|
void SetWidth(int w);
|
|
void SetHeight(int h);
|
|
void SetDepth(int d);
|
|
void SetOk(bool isOk);
|
|
|
|
wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }
|
|
|
|
WXHICON GetHICON() const;
|
|
|
|
#if wxOSX_USE_COCOA
|
|
WX_NSImage GetNSImage() const ;
|
|
#endif
|
|
|
|
protected:
|
|
virtual wxGDIRefData *CreateGDIRefData() const;
|
|
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxIcon);
|
|
|
|
bool LoadIconFromSystemResource(const wxString& resourceName, int desiredWidth, int desiredHeight);
|
|
bool LoadIconFromBundleResource(const wxString& resourceName, int desiredWidth, int desiredHeight);
|
|
bool LoadIconFromFile(const wxString& filename, int desiredWidth, int desiredHeight);
|
|
bool LoadIconAsBitmap(const wxString& filename, wxBitmapType flags = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1);
|
|
};
|
|
|
|
class WXDLLIMPEXP_CORE wxICONResourceHandler: public wxBitmapHandler
|
|
{
|
|
public:
|
|
wxICONResourceHandler()
|
|
{
|
|
SetName(wxT("ICON resource"));
|
|
SetExtension(wxEmptyString);
|
|
SetType(wxBITMAP_TYPE_ICON_RESOURCE);
|
|
}
|
|
|
|
virtual bool LoadFile(wxBitmap *bitmap,
|
|
const wxString& name,
|
|
wxBitmapType flags,
|
|
int desiredWidth = -1,
|
|
int desiredHeight = -1);
|
|
|
|
// unhide the base class virtual
|
|
virtual bool LoadFile(wxBitmap *bitmap,
|
|
const wxString& name,
|
|
wxBitmapType flags)
|
|
{ return LoadFile(bitmap, name, flags, -1, -1); }
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxICONResourceHandler);
|
|
};
|
|
|
|
#endif
|
|
// _WX_ICON_H_
|