mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-12 09:09:12 +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.
114 lines
3.4 KiB
C++
114 lines
3.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/cursor.h
|
|
// Purpose: wxCursor base header
|
|
// Author: Julian Smart, Vadim Zeitlin
|
|
// Created:
|
|
// Copyright: (c) Julian Smart
|
|
// (c) 2014 Vadim Zeitlin (wxCursorBase)
|
|
// Licence: wxWindows Licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_CURSOR_H_BASE_
|
|
#define _WX_CURSOR_H_BASE_
|
|
|
|
#include "wx/gdiobj.h"
|
|
#include "wx/gdicmn.h"
|
|
|
|
// Under most ports, wxCursor derives directly from wxGDIObject, but in wxMSW
|
|
// there is an intermediate wxGDIImage class.
|
|
#ifdef __WXMSW__
|
|
#include "wx/msw/gdiimage.h"
|
|
#else
|
|
typedef wxGDIObject wxGDIImage;
|
|
#endif
|
|
|
|
class WXDLLIMPEXP_CORE wxCursorBase : public wxGDIImage
|
|
{
|
|
public:
|
|
/*
|
|
wxCursor classes should provide the following ctors:
|
|
|
|
wxCursor();
|
|
wxCursor(const wxImage& image);
|
|
wxCursor(const wxString& name,
|
|
wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
|
|
int hotSpotX = 0, int hotSpotY = 0);
|
|
wxCursor(wxStockCursor id) { InitFromStock(id); }
|
|
#if WXWIN_COMPATIBILITY_2_8
|
|
wxCursor(int id) { InitFromStock((wxStockCursor)id); }
|
|
#endif
|
|
*/
|
|
|
|
virtual wxPoint GetHotSpot() const { return wxDefaultPosition; }
|
|
};
|
|
|
|
#if defined(__WXMSW__)
|
|
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE
|
|
#include "wx/msw/cursor.h"
|
|
#elif defined(__WXMOTIF__)
|
|
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XBM
|
|
#include "wx/motif/cursor.h"
|
|
#elif defined(__WXGTK20__)
|
|
#ifdef __WINDOWS__
|
|
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE
|
|
#else
|
|
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM
|
|
#endif
|
|
#include "wx/gtk/cursor.h"
|
|
#elif defined(__WXGTK__)
|
|
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM
|
|
#include "wx/gtk1/cursor.h"
|
|
#elif defined(__WXX11__)
|
|
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XPM
|
|
#include "wx/x11/cursor.h"
|
|
#elif defined(__WXDFB__)
|
|
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE
|
|
#include "wx/dfb/cursor.h"
|
|
#elif defined(__WXMAC__)
|
|
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_MACCURSOR_RESOURCE
|
|
#include "wx/osx/cursor.h"
|
|
#elif defined(__WXQT__)
|
|
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR
|
|
#include "wx/qt/cursor.h"
|
|
#endif
|
|
|
|
#include "wx/utils.h"
|
|
|
|
/* This is a small class which can be used by all ports
|
|
to temporarily suspend the busy cursor. Useful in modal
|
|
dialogs.
|
|
|
|
Actually that is not (any longer) quite true.. currently it is
|
|
only used in wxGTK Dialog::ShowModal() and now uses static
|
|
wxBusyCursor methods that are only implemented for wxGTK so far.
|
|
The BusyCursor handling code should probably be implemented in
|
|
common code somewhere instead of the separate implementations we
|
|
currently have. Also the name BusyCursorSuspender is a little
|
|
misleading since it doesn't actually suspend the BusyCursor, just
|
|
masks one that is already showing.
|
|
If another call to wxBeginBusyCursor is made while this is active
|
|
the Busy Cursor will again be shown. But at least now it doesn't
|
|
interfere with the state of wxIsBusy() -- RL
|
|
|
|
*/
|
|
class wxBusyCursorSuspender
|
|
{
|
|
public:
|
|
wxBusyCursorSuspender()
|
|
{
|
|
if( wxIsBusy() )
|
|
{
|
|
wxSetCursor( wxBusyCursor::GetStoredCursor() );
|
|
}
|
|
}
|
|
~wxBusyCursorSuspender()
|
|
{
|
|
if( wxIsBusy() )
|
|
{
|
|
wxSetCursor( wxBusyCursor::GetBusyCursor() );
|
|
}
|
|
}
|
|
};
|
|
#endif
|
|
// _WX_CURSOR_H_BASE_
|