mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 00:59:44 -06:00
Upgrade WX to r74856, mainly to support @2x.
This commit is contained in:
10
Externals/wxWidgets3/include/wx/dvrenderers.h
vendored
10
Externals/wxWidgets3/include/wx/dvrenderers.h
vendored
@ -3,7 +3,6 @@
|
||||
// Purpose: Declare all wxDataViewCtrl classes
|
||||
// Author: Robert Roebling, Vadim Zeitlin
|
||||
// Created: 2009-11-08 (extracted from wx/dataview.h)
|
||||
// RCS-ID: $Id: dvrenderers.h 70050 2011-12-19 12:54:38Z VZ $
|
||||
// Copyright: (c) 2006 Robert Roebling
|
||||
// (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
|
||||
// Licence: wxWindows licence
|
||||
@ -168,6 +167,15 @@ protected:
|
||||
// Called from {Cancel,Finish}Editing() to cleanup m_editorCtrl
|
||||
void DestroyEditControl();
|
||||
|
||||
// Return the alignment of this renderer if it's specified (i.e. has value
|
||||
// different from the default wxDVR_DEFAULT_ALIGNMENT) or the alignment of
|
||||
// the column it is used for otherwise.
|
||||
//
|
||||
// Unlike GetAlignment(), this always returns a valid combination of
|
||||
// wxALIGN_XXX flags (although possibly wxALIGN_NOT) and never returns
|
||||
// wxDVR_DEFAULT_ALIGNMENT.
|
||||
int GetEffectiveAlignment() const;
|
||||
|
||||
wxString m_variantType;
|
||||
wxDataViewColumn *m_owner;
|
||||
wxWeakRef<wxWindow> m_editorCtrl;
|
||||
|
Reference in New Issue
Block a user