Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace wxUSE_GENERICDATAVIEWCTRL with wxHAS_GENERIC_DATAVIEWCTRL

Browse Source 
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:
Tim S
2018-06-03 17:18:59 -04:00
committed by Vadim Zeitlin
parent 950b1a9d51
commit bc92ed9d85
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/datavcmn.cpp
View File

@@ -728,7 +728,7 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
m_editorCtrl->PushEventHandler( handler ); m_editorCtrl->PushEventHandler( handler );
#if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL) #if defined(__WXGTK20__) && !defined(wxHAS_GENERIC_DATAVIEWCTRL)
handler->SetFocusOnIdle(); handler->SetFocusOnIdle();
#else #else
m_editorCtrl->SetFocus(); m_editorCtrl->SetFocus();
@@ -3050,7 +3050,7 @@ void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event )
void wxDataViewTreeCtrl::OnSize( wxSizeEvent &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 // automatically resize our only column to take the entire control width
if ( GetColumnCount() ) if ( GetColumnCount() )
{ {

4
src/generic/datavgen.cpp
View File

@@ -18,7 +18,7 @@
#include "wx/dataview.h" #include "wx/dataview.h"
#ifdef wxUSE_GENERICDATAVIEWCTRL #ifdef wxHAS_GENERIC_DATAVIEWCTRL
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#ifdef __WXMSW__ #ifdef __WXMSW__
@@ -6782,6 +6782,6 @@ wxAccStatus wxDataViewCtrlAccessible::GetSelections(wxVariant* selections)
} }
#endif // wxUSE_ACCESSIBILITY #endif // wxUSE_ACCESSIBILITY
#endif // !wxUSE_GENERICDATAVIEWCTRL #endif // !wxHAS_GENERIC_DATAVIEWCTRL
#endif // wxUSE_DATAVIEWCTRL #endif // wxUSE_DATAVIEWCTRL

4
src/gtk/dataview.cpp
View File

@@ -13,7 +13,7 @@
#include "wx/dataview.h" #include "wx/dataview.h"
#ifndef wxUSE_GENERICDATAVIEWCTRL #ifndef wxHAS_GENERIC_DATAVIEWCTRL
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/log.h" #include "wx/log.h"
@@ -5313,6 +5313,6 @@ void wxDataViewCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
GTKApplyStyle(m_treeview, style); GTKApplyStyle(m_treeview, style);
} }
#endif // !wxUSE_GENERICDATAVIEWCTRL #endif // !wxHAS_GENERIC_DATAVIEWCTRL
#endif // wxUSE_DATAVIEWCTRL #endif // wxUSE_DATAVIEWCTRL

4
src/osx/dataview_osx.cpp
View File

@@ -13,7 +13,7 @@
#include "wx/dataview.h" #include "wx/dataview.h"
#ifndef wxUSE_GENERICDATAVIEWCTRL #ifndef wxHAS_GENERIC_DATAVIEWCTRL
#include <limits> #include <limits>
@@ -750,6 +750,6 @@ wxBEGIN_EVENT_TABLE(wxDataViewCtrl,wxDataViewCtrlBase)
EVT_MOTION(wxDataViewCtrl::OnMouse) EVT_MOTION(wxDataViewCtrl::OnMouse)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
#endif // !wxUSE_GENERICDATAVIEWCTRL #endif // !wxHAS_GENERIC_DATAVIEWCTRL
#endif // wxUSE_DATAVIEWCTRL #endif // wxUSE_DATAVIEWCTRL

4
src/qt/dataview.cpp
View File

@@ -12,7 +12,7 @@
#include "wx/dataview.h" #include "wx/dataview.h"
#ifndef wxUSE_GENERICDATAVIEWCTRL #ifndef wxHAS_GENERIC_DATAVIEWCTRL
wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer, wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,
unsigned int model_column, int width, 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 #endif // wxUSE_DATAVIEWCTRL

4
src/qt/dvrenderer.cpp
View File

@@ -12,7 +12,7 @@
#include "wx/dataview.h" #include "wx/dataview.h"
#ifndef wxUSE_GENERICDATAVIEWCTRL #ifndef wxHAS_GENERIC_DATAVIEWCTRL
wxDataViewRenderer::wxDataViewRenderer( const wxString &variantType, wxDataViewRenderer::wxDataViewRenderer( const wxString &variantType,
wxDataViewCellMode mode, wxDataViewCellMode mode,
@@ -48,6 +48,6 @@ wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const
return wxEllipsizeMode(); return wxEllipsizeMode();
} }
#endif // !wxUSE_GENERICDATAVIEWCTRL #endif // !wxHAS_GENERIC_DATAVIEWCTRL
#endif // wxUSE_DATAVIEWCTRL #endif // wxUSE_DATAVIEWCTRL

4
src/qt/dvrenderers.cpp
View File

@@ -12,7 +12,7 @@
#include "wx/dataview.h" #include "wx/dataview.h"
#ifndef wxUSE_GENERICDATAVIEWCTRL #ifndef wxHAS_GENERIC_DATAVIEWCTRL
wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype,
wxDataViewCellMode mode, wxDataViewCellMode mode,
@@ -256,6 +256,6 @@ void wxDataViewChoiceRenderer::SetAlignment( int align )
} }
#endif // !wxUSE_GENERICDATAVIEWCTRL #endif // !wxHAS_GENERIC_DATAVIEWCTRL
#endif // wxUSE_DATAVIEWCTRL #endif // wxUSE_DATAVIEWCTRL