mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 12:21:41 +02: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.
78 lines
2.2 KiB
C++
78 lines
2.2 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/busyinfo.h
|
|
// Purpose: Information window (when app is busy)
|
|
// Author: Vaclav Slavik
|
|
// Copyright: (c) 1999 Vaclav Slavik
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef __BUSYINFO_H_BASE__
|
|
#define __BUSYINFO_H_BASE__
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_BUSYINFO
|
|
|
|
#include "wx/colour.h"
|
|
#include "wx/icon.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
|
|
|
// This class is used to pass all the various parameters to wxBusyInfo ctor.
|
|
// According to the usual naming conventions (see wxAboutDialogInfo,
|
|
// wxFontInfo, ...) it would be called wxBusyInfoInfo, but this would have been
|
|
// rather strange, so we call it wxBusyInfoFlags instead.
|
|
//
|
|
// Methods are mostly self-explanatory except for the difference between "Text"
|
|
// and "Label": the former can contain markup, while the latter is just plain
|
|
// string which is not parsed in any way.
|
|
class wxBusyInfoFlags
|
|
{
|
|
public:
|
|
wxBusyInfoFlags()
|
|
{
|
|
m_parent = NULL;
|
|
m_alpha = wxALPHA_OPAQUE;
|
|
}
|
|
|
|
wxBusyInfoFlags& Parent(wxWindow* parent)
|
|
{ m_parent = parent; return *this; }
|
|
|
|
wxBusyInfoFlags& Icon(const wxIcon& icon)
|
|
{ m_icon = icon; return *this; }
|
|
wxBusyInfoFlags& Title(const wxString& title)
|
|
{ m_title = title; return *this; }
|
|
wxBusyInfoFlags& Text(const wxString& text)
|
|
{ m_text = text; return *this; }
|
|
wxBusyInfoFlags& Label(const wxString& label)
|
|
{ m_label = label; return *this; }
|
|
|
|
wxBusyInfoFlags& Foreground(const wxColour& foreground)
|
|
{ m_foreground = foreground; return *this; }
|
|
wxBusyInfoFlags& Background(const wxColour& background)
|
|
{ m_background = background; return *this; }
|
|
|
|
wxBusyInfoFlags& Transparency(wxByte alpha)
|
|
{ m_alpha = alpha; return *this; }
|
|
|
|
private:
|
|
wxWindow* m_parent;
|
|
|
|
wxIcon m_icon;
|
|
wxString m_title,
|
|
m_text,
|
|
m_label;
|
|
|
|
wxColour m_foreground,
|
|
m_background;
|
|
|
|
wxByte m_alpha;
|
|
|
|
friend class wxBusyInfo;
|
|
};
|
|
|
|
#include "wx/generic/busyinfo.h"
|
|
|
|
#endif // wxUSE_BUSYINFO
|
|
|
|
#endif // __BUSYINFO_H_BASE__
|