Replace wxUSE_GENERICDATAVIEWCTRL with wxHAS_GENERIC_DATAVIEWCTRL
The former symbol is inconsistent with all the other wxUSE_XXX ones and hence confusing and kept only for compatibility reasons. Closes https://github.com/wxWidgets/wxWidgets/pull/827
This commit is contained in:
@@ -728,7 +728,7 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
|
||||
|
||||
m_editorCtrl->PushEventHandler( handler );
|
||||
|
||||
#if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL)
|
||||
#if defined(__WXGTK20__) && !defined(wxHAS_GENERIC_DATAVIEWCTRL)
|
||||
handler->SetFocusOnIdle();
|
||||
#else
|
||||
m_editorCtrl->SetFocus();
|
||||
@@ -3050,7 +3050,7 @@ void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event )
|
||||
|
||||
void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event )
|
||||
{
|
||||
#if defined(wxUSE_GENERICDATAVIEWCTRL)
|
||||
#if defined(wxHAS_GENERIC_DATAVIEWCTRL)
|
||||
// automatically resize our only column to take the entire control width
|
||||
if ( GetColumnCount() )
|
||||
{
|
||||
|
@@ -18,7 +18,7 @@
|
||||
|
||||
#include "wx/dataview.h"
|
||||
|
||||
#ifdef wxUSE_GENERICDATAVIEWCTRL
|
||||
#ifdef wxHAS_GENERIC_DATAVIEWCTRL
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#ifdef __WXMSW__
|
||||
@@ -6782,6 +6782,6 @@ wxAccStatus wxDataViewCtrlAccessible::GetSelections(wxVariant* selections)
|
||||
}
|
||||
#endif // wxUSE_ACCESSIBILITY
|
||||
|
||||
#endif // !wxUSE_GENERICDATAVIEWCTRL
|
||||
#endif // !wxHAS_GENERIC_DATAVIEWCTRL
|
||||
|
||||
#endif // wxUSE_DATAVIEWCTRL
|
||||
|
@@ -13,7 +13,7 @@
|
||||
|
||||
#include "wx/dataview.h"
|
||||
|
||||
#ifndef wxUSE_GENERICDATAVIEWCTRL
|
||||
#ifndef wxHAS_GENERIC_DATAVIEWCTRL
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/log.h"
|
||||
@@ -5313,6 +5313,6 @@ void wxDataViewCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
|
||||
GTKApplyStyle(m_treeview, style);
|
||||
}
|
||||
|
||||
#endif // !wxUSE_GENERICDATAVIEWCTRL
|
||||
#endif // !wxHAS_GENERIC_DATAVIEWCTRL
|
||||
|
||||
#endif // wxUSE_DATAVIEWCTRL
|
||||
|
@@ -13,7 +13,7 @@
|
||||
|
||||
#include "wx/dataview.h"
|
||||
|
||||
#ifndef wxUSE_GENERICDATAVIEWCTRL
|
||||
#ifndef wxHAS_GENERIC_DATAVIEWCTRL
|
||||
|
||||
#include <limits>
|
||||
|
||||
@@ -750,6 +750,6 @@ wxBEGIN_EVENT_TABLE(wxDataViewCtrl,wxDataViewCtrlBase)
|
||||
EVT_MOTION(wxDataViewCtrl::OnMouse)
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
#endif // !wxUSE_GENERICDATAVIEWCTRL
|
||||
#endif // !wxHAS_GENERIC_DATAVIEWCTRL
|
||||
|
||||
#endif // wxUSE_DATAVIEWCTRL
|
||||
|
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "wx/dataview.h"
|
||||
|
||||
#ifndef wxUSE_GENERICDATAVIEWCTRL
|
||||
#ifndef wxHAS_GENERIC_DATAVIEWCTRL
|
||||
|
||||
wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,
|
||||
unsigned int model_column, int width,
|
||||
@@ -316,6 +316,6 @@ void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item)
|
||||
{
|
||||
}
|
||||
|
||||
#endif // !wxUSE_GENERICDATAVIEWCTRL
|
||||
#endif // !wxHAS_GENERIC_DATAVIEWCTRL
|
||||
|
||||
#endif // wxUSE_DATAVIEWCTRL
|
||||
|
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "wx/dataview.h"
|
||||
|
||||
#ifndef wxUSE_GENERICDATAVIEWCTRL
|
||||
#ifndef wxHAS_GENERIC_DATAVIEWCTRL
|
||||
|
||||
wxDataViewRenderer::wxDataViewRenderer( const wxString &variantType,
|
||||
wxDataViewCellMode mode,
|
||||
@@ -48,6 +48,6 @@ wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const
|
||||
return wxEllipsizeMode();
|
||||
}
|
||||
|
||||
#endif // !wxUSE_GENERICDATAVIEWCTRL
|
||||
#endif // !wxHAS_GENERIC_DATAVIEWCTRL
|
||||
|
||||
#endif // wxUSE_DATAVIEWCTRL
|
||||
|
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "wx/dataview.h"
|
||||
|
||||
#ifndef wxUSE_GENERICDATAVIEWCTRL
|
||||
#ifndef wxHAS_GENERIC_DATAVIEWCTRL
|
||||
|
||||
wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype,
|
||||
wxDataViewCellMode mode,
|
||||
@@ -256,6 +256,6 @@ void wxDataViewChoiceRenderer::SetAlignment( int align )
|
||||
|
||||
}
|
||||
|
||||
#endif // !wxUSE_GENERICDATAVIEWCTRL
|
||||
#endif // !wxHAS_GENERIC_DATAVIEWCTRL
|
||||
|
||||
#endif // wxUSE_DATAVIEWCTRL
|
||||
|
Reference in New Issue
Block a user