mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 01:29: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.
133 lines
4.2 KiB
C++
133 lines
4.2 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/bmpbuttn.h
|
|
// Purpose: wxBitmapButton class interface
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 25.08.00
|
|
// Copyright: (c) 2000 Vadim Zeitlin
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_BMPBUTTON_H_BASE_
|
|
#define _WX_BMPBUTTON_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_BMPBUTTON
|
|
|
|
#include "wx/button.h"
|
|
|
|
// FIXME: right now only wxMSW, wxGTK and wxOSX implement bitmap support in wxButton
|
|
// itself, this shouldn't be used for the other platforms neither
|
|
// when all of them do it
|
|
#if (defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXOSX__) || defined(__WXQT__)) && !defined(__WXUNIVERSAL__)
|
|
#define wxHAS_BUTTON_BITMAP
|
|
#endif
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxBitmapButton;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxBitmapButton: a button which shows bitmaps instead of the usual string.
|
|
// It has different bitmaps for different states (focused/disabled/pressed)
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxBitmapButtonBase : public wxButton
|
|
{
|
|
public:
|
|
wxBitmapButtonBase()
|
|
{
|
|
#ifndef wxHAS_BUTTON_BITMAP
|
|
m_marginX =
|
|
m_marginY = 0;
|
|
#endif // wxHAS_BUTTON_BITMAP
|
|
}
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID winid,
|
|
const wxPoint& pos,
|
|
const wxSize& size,
|
|
long style,
|
|
const wxValidator& validator,
|
|
const wxString& name)
|
|
{
|
|
// We use wxBU_NOTEXT to let the base class Create() know that we are
|
|
// not going to show the label: this is a hack needed for wxGTK where
|
|
// we can show both label and bitmap only with GTK 2.6+ but we always
|
|
// can show just one of them and this style allows us to choose which
|
|
// one we need.
|
|
//
|
|
// And we also use wxBU_EXACTFIT to avoid being resized up to the
|
|
// standard button size as this doesn't make sense for bitmap buttons
|
|
// which are not standard anyhow and should fit their bitmap size.
|
|
return wxButton::Create(parent, winid, "",
|
|
pos, size,
|
|
style | wxBU_NOTEXT | wxBU_EXACTFIT,
|
|
validator, name);
|
|
}
|
|
|
|
// Special creation function for a standard "Close" bitmap. It allows to
|
|
// simply create a close button with the image appropriate for the current
|
|
// platform.
|
|
static wxBitmapButton* NewCloseButton(wxWindow* parent, wxWindowID winid);
|
|
|
|
|
|
// set/get the margins around the button
|
|
virtual void SetMargins(int x, int y)
|
|
{
|
|
DoSetBitmapMargins(x, y);
|
|
}
|
|
|
|
int GetMarginX() const { return DoGetBitmapMargins().x; }
|
|
int GetMarginY() const { return DoGetBitmapMargins().y; }
|
|
|
|
protected:
|
|
#ifndef wxHAS_BUTTON_BITMAP
|
|
// function called when any of the bitmaps changes
|
|
virtual void OnSetBitmap() { InvalidateBestSize(); Refresh(); }
|
|
|
|
virtual wxBitmap DoGetBitmap(State which) const { return m_bitmaps[which]; }
|
|
virtual void DoSetBitmap(const wxBitmap& bitmap, State which)
|
|
{ m_bitmaps[which] = bitmap; OnSetBitmap(); }
|
|
|
|
virtual wxSize DoGetBitmapMargins() const
|
|
{
|
|
return wxSize(m_marginX, m_marginY);
|
|
}
|
|
|
|
virtual void DoSetBitmapMargins(int x, int y)
|
|
{
|
|
m_marginX = x;
|
|
m_marginY = y;
|
|
}
|
|
|
|
// the bitmaps for various states
|
|
wxBitmap m_bitmaps[State_Max];
|
|
|
|
// the margins around the bitmap
|
|
int m_marginX,
|
|
m_marginY;
|
|
#endif // !wxHAS_BUTTON_BITMAP
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxBitmapButtonBase);
|
|
};
|
|
|
|
#if defined(__WXUNIVERSAL__)
|
|
#include "wx/univ/bmpbuttn.h"
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/bmpbuttn.h"
|
|
#elif defined(__WXMOTIF__)
|
|
#include "wx/motif/bmpbuttn.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/bmpbuttn.h"
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/bmpbuttn.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/bmpbuttn.h"
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/bmpbuttn.h"
|
|
#endif
|
|
|
|
#endif // wxUSE_BMPBUTTON
|
|
|
|
#endif // _WX_BMPBUTTON_H_BASE_
|