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.
109 lines
2.9 KiB
C++
109 lines
2.9 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/dcclient.h
|
|
// Purpose: wxClientDC class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 01/02/97
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_DCCLIENT_H_
|
|
#define _WX_DCCLIENT_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#include "wx/dc.h"
|
|
#include "wx/msw/dc.h"
|
|
#include "wx/dcclient.h"
|
|
|
|
class wxPaintDCInfo;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// DC classes
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxMSWDCImpl
|
|
{
|
|
public:
|
|
// default ctor
|
|
wxWindowDCImpl( wxDC *owner );
|
|
|
|
// Create a DC corresponding to the whole window
|
|
wxWindowDCImpl( wxDC *owner, wxWindow *win );
|
|
|
|
virtual void DoGetSize(int *width, int *height) const;
|
|
|
|
protected:
|
|
// initialize the newly created DC
|
|
void InitDC();
|
|
|
|
wxDECLARE_CLASS(wxWindowDCImpl);
|
|
wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
|
|
};
|
|
|
|
class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
|
|
{
|
|
public:
|
|
// default ctor
|
|
wxClientDCImpl( wxDC *owner );
|
|
|
|
// Create a DC corresponding to the client area of the window
|
|
wxClientDCImpl( wxDC *owner, wxWindow *win );
|
|
|
|
virtual ~wxClientDCImpl();
|
|
|
|
virtual void DoGetSize(int *width, int *height) const;
|
|
|
|
protected:
|
|
void InitDC();
|
|
|
|
wxDECLARE_CLASS(wxClientDCImpl);
|
|
wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
|
|
};
|
|
|
|
class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl
|
|
{
|
|
public:
|
|
wxPaintDCImpl( wxDC *owner );
|
|
|
|
// Create a DC corresponding for painting the window in OnPaint()
|
|
wxPaintDCImpl( wxDC *owner, wxWindow *win );
|
|
|
|
virtual ~wxPaintDCImpl();
|
|
|
|
// find the entry for this DC in the cache (keyed by the window)
|
|
static WXHDC FindDCInCache(wxWindow* win);
|
|
|
|
// This must be called by the code handling WM_PAINT to remove the DC
|
|
// cached for this window for the duration of this message processing.
|
|
static void EndPaint(wxWindow *win);
|
|
|
|
protected:
|
|
// Find the DC for this window in the cache, return NULL if not found.
|
|
static wxPaintDCInfo *FindInCache(wxWindow* win);
|
|
|
|
wxDECLARE_CLASS(wxPaintDCImpl);
|
|
wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
|
|
};
|
|
|
|
/*
|
|
* wxPaintDCEx
|
|
* This class is used when an application sends an HDC with the WM_PAINT
|
|
* message. It is used in HandlePaint and need not be used by an application.
|
|
*/
|
|
|
|
class WXDLLIMPEXP_CORE wxPaintDCEx : public wxPaintDC
|
|
{
|
|
public:
|
|
wxPaintDCEx(wxWindow *canvas, WXHDC dc);
|
|
|
|
wxDECLARE_CLASS(wxPaintDCEx);
|
|
wxDECLARE_NO_COPY_CLASS(wxPaintDCEx);
|
|
};
|
|
|
|
#endif
|
|
// _WX_DCCLIENT_H_
|