mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-10 08:09:26 +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.
85 lines
2.3 KiB
C++
85 lines
2.3 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/statbmp.h
|
|
// Purpose: wxStaticBitmap class interface
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 25.08.00
|
|
// Copyright: (c) 2000 Vadim Zeitlin
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_STATBMP_H_BASE_
|
|
#define _WX_STATBMP_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_STATBMP
|
|
|
|
#include "wx/control.h"
|
|
#include "wx/bitmap.h"
|
|
#include "wx/icon.h"
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[];
|
|
|
|
// a control showing an icon or a bitmap
|
|
class WXDLLIMPEXP_CORE wxStaticBitmapBase : public wxControl
|
|
{
|
|
public:
|
|
enum ScaleMode
|
|
{
|
|
Scale_None,
|
|
Scale_Fill,
|
|
Scale_AspectFit,
|
|
Scale_AspectFill
|
|
};
|
|
|
|
wxStaticBitmapBase() { }
|
|
virtual ~wxStaticBitmapBase();
|
|
|
|
// our interface
|
|
virtual void SetIcon(const wxIcon& icon) = 0;
|
|
virtual void SetBitmap(const wxBitmap& bitmap) = 0;
|
|
virtual wxBitmap GetBitmap() const = 0;
|
|
virtual wxIcon GetIcon() const /* = 0 -- should be pure virtual */
|
|
{
|
|
// stub it out here for now as not all ports implement it (but they
|
|
// should)
|
|
return wxIcon();
|
|
}
|
|
virtual void SetScaleMode(ScaleMode WXUNUSED(scaleMode)) { }
|
|
virtual ScaleMode GetScaleMode() const { return Scale_None; }
|
|
|
|
// overridden base class virtuals
|
|
virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
|
|
virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
|
|
|
|
protected:
|
|
// choose the default border for this window
|
|
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
|
|
|
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxStaticBitmapBase);
|
|
};
|
|
|
|
#if defined(__WXUNIVERSAL__)
|
|
#include "wx/univ/statbmp.h"
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/statbmp.h"
|
|
#elif defined(__WXMOTIF__)
|
|
#include "wx/motif/statbmp.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/statbmp.h"
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/statbmp.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/statbmp.h"
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/statbmp.h"
|
|
#endif
|
|
|
|
#endif // wxUSE_STATBMP
|
|
|
|
#endif
|
|
// _WX_STATBMP_H_BASE_
|