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

Make wxDataViewCtrl::FromGTKColumn() public and rename

Browse Source 
This function has to be called from a GTK+ callback, so make it public
and also rename to GTKColumnToWX() to conform to the naming convention
mandating the use of "GTK" prefix for the public methods which are not
part of the public API.
This commit is contained in:
Vadim Zeitlin
2018-10-09 15:12:42 +02:00
parent 11f80e3e34
commit 818d69f113
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/gtk/dataview.h
View File

@@ -185,6 +185,12 @@ public:
// failed. // failed.
wxDataViewItem GTKPathToItem(struct _GtkTreePath *path) const; wxDataViewItem GTKPathToItem(struct _GtkTreePath *path) const;
// Return wxDataViewColumn matching the given GtkTreeViewColumn.
//
// If the input argument is NULL, return NULL too. Otherwise we must find
// the matching column and assert if we didn't.
wxDataViewColumn* GTKColumnToWX(GtkTreeViewColumn *gtk_col) const;
virtual void OnInternalIdle() wxOVERRIDE; virtual void OnInternalIdle() wxOVERRIDE;
int GTKGetUniformRowHeight() const { return m_uniformRowHeight; } int GTKGetUniformRowHeight() const { return m_uniformRowHeight; }
@@ -222,12 +228,6 @@ private:
virtual wxDataViewItem DoGetCurrentItem() const wxOVERRIDE; virtual wxDataViewItem DoGetCurrentItem() const wxOVERRIDE;
virtual void DoSetCurrentItem(const wxDataViewItem& item) wxOVERRIDE; virtual void DoSetCurrentItem(const wxDataViewItem& item) wxOVERRIDE;
// Return wxDataViewColumn matching the given GtkTreeViewColumn.
//
// If the input argument is NULL, return NULL too. Otherwise we must find
// the matching column and assert if we didn't.
wxDataViewColumn* FromGTKColumn(GtkTreeViewColumn *gtk_col) const;
friend class wxDataViewCtrlDCImpl; friend class wxDataViewCtrlDCImpl;
friend class wxDataViewColumn; friend class wxDataViewColumn;
friend class wxDataViewCtrlInternal; friend class wxDataViewCtrlInternal;

8
src/gtk/dataview.cpp
View File

@@ -4617,7 +4617,7 @@ wxDataViewCtrl::~wxDataViewCtrl()
GtkTreeViewColumn *col; GtkTreeViewColumn *col;
gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), NULL, &col); gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), NULL, &col);
wxDataViewColumn * const wxcol = FromGTKColumn(col); wxDataViewColumn * const wxcol = GTKColumnToWX(col);
if ( wxcol ) if ( wxcol )
{ {
// This won't do anything if we're not editing it // This won't do anything if we're not editing it
@@ -4862,7 +4862,7 @@ unsigned int wxDataViewCtrl::GetColumnCount() const
return m_cols.GetCount(); return m_cols.GetCount();
} }
wxDataViewColumn* wxDataViewCtrl::FromGTKColumn(GtkTreeViewColumn *gtk_col) const wxDataViewColumn* wxDataViewCtrl::GTKColumnToWX(GtkTreeViewColumn *gtk_col) const
{ {
if ( !gtk_col ) if ( !gtk_col )
return NULL; return NULL;
@@ -4886,7 +4886,7 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
{ {
GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos ); GtkTreeViewColumn *gtk_col = gtk_tree_view_get_column( GTK_TREE_VIEW(m_treeview), pos );
return FromGTKColumn(gtk_col); return GTKColumnToWX(gtk_col);
} }
bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
@@ -5058,7 +5058,7 @@ wxDataViewColumn *wxDataViewCtrl::GetCurrentColumn() const
GtkTreeViewColumn *col; GtkTreeViewColumn *col;
gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), NULL, &col); gtk_tree_view_get_cursor(GTK_TREE_VIEW(m_treeview), NULL, &col);
return FromGTKColumn(col); return GTKColumnToWX(col);
} }
void wxDataViewCtrl::EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) void wxDataViewCtrl::EditItem(const wxDataViewItem& item, const wxDataViewColumn *column)