mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 10:39:13 +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.
68 lines
2.4 KiB
C++
68 lines
2.4 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/dvrenderer.h
|
|
// Purpose: wxDataViewRenderer for generic wxDataViewCtrl implementation
|
|
// Author: Robert Roebling, Vadim Zeitlin
|
|
// Created: 2009-11-07 (extracted from wx/generic/dataview.h)
|
|
// Copyright: (c) 2006 Robert Roebling
|
|
// (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GENERIC_DVRENDERER_H_
|
|
#define _WX_GENERIC_DVRENDERER_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxDataViewRenderer
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewCustomRendererBase
|
|
{
|
|
public:
|
|
wxDataViewRenderer( const wxString &varianttype,
|
|
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
|
|
int align = wxDVR_DEFAULT_ALIGNMENT );
|
|
virtual ~wxDataViewRenderer();
|
|
|
|
virtual wxDC *GetDC();
|
|
|
|
virtual void SetAlignment( int align );
|
|
virtual int GetAlignment() const;
|
|
|
|
virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE)
|
|
{ m_ellipsizeMode = mode; }
|
|
virtual wxEllipsizeMode GetEllipsizeMode() const
|
|
{ return m_ellipsizeMode; }
|
|
|
|
virtual void SetMode( wxDataViewCellMode mode )
|
|
{ m_mode = mode; }
|
|
virtual wxDataViewCellMode GetMode() const
|
|
{ return m_mode; }
|
|
|
|
// implementation
|
|
|
|
// This callback is used by generic implementation of wxDVC itself. It's
|
|
// different from the corresponding ActivateCell() method which should only
|
|
// be overridable for the custom renderers while the generic implementation
|
|
// uses this one for all of them, including the standard ones.
|
|
|
|
virtual bool WXActivateCell(const wxRect& WXUNUSED(cell),
|
|
wxDataViewModel *WXUNUSED(model),
|
|
const wxDataViewItem & WXUNUSED(item),
|
|
unsigned int WXUNUSED(col),
|
|
const wxMouseEvent* WXUNUSED(mouseEvent))
|
|
{ return false; }
|
|
|
|
private:
|
|
int m_align;
|
|
wxDataViewCellMode m_mode;
|
|
|
|
wxEllipsizeMode m_ellipsizeMode;
|
|
|
|
wxDC *m_dc;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer);
|
|
};
|
|
|
|
#endif // _WX_GENERIC_DVRENDERER_H_
|
|
|