mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-18 10:24:15 +00: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.
59 lines
1.7 KiB
C++
59 lines
1.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/cursor.h
|
|
// Purpose:
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) 1998 Robert Roebling
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTK_CURSOR_H_
|
|
#define _WX_GTK_CURSOR_H_
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxImage;
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxCursor
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase
|
|
{
|
|
public:
|
|
wxCursor();
|
|
wxCursor(wxStockCursor id) { InitFromStock(id); }
|
|
#if WXWIN_COMPATIBILITY_2_8
|
|
wxCursor(int id) { InitFromStock((wxStockCursor)id); }
|
|
#endif
|
|
#if wxUSE_IMAGE
|
|
wxCursor( const wxImage & image );
|
|
wxCursor(const wxString& name,
|
|
wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
|
|
int hotSpotX = 0, int hotSpotY = 0);
|
|
#endif
|
|
wxCursor( const char bits[], int width, int height,
|
|
int hotSpotX = -1, int hotSpotY = -1,
|
|
const char maskBits[] = NULL,
|
|
const wxColour* fg = NULL, const wxColour* bg = NULL);
|
|
|
|
virtual wxPoint GetHotSpot() const wxOVERRIDE;
|
|
|
|
virtual ~wxCursor();
|
|
|
|
// implementation
|
|
|
|
GdkCursor *GetCursor() const;
|
|
|
|
protected:
|
|
void InitFromStock(wxStockCursor);
|
|
#if wxUSE_IMAGE
|
|
void InitFromImage(const wxImage& image);
|
|
#endif
|
|
|
|
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
|
|
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxCursor);
|
|
};
|
|
|
|
#endif // _WX_GTK_CURSOR_H_
|