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

Introduce ABI shims for wxListCtrl column ordering functions

Browse Source 
This way it is easier to add the functions later on without
breaking ABI.
This commit is contained in:
Ian McInerney
2021-04-17 19:33:25 +01:00
committed by Vadim Zeitlin
parent e0ef3830c1
commit 797bc2c087
5 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/generic/listctrl.h
View File

@@ -68,6 +68,14 @@ public:
bool SetColumn( int col, const wxListItem& item ) wxOVERRIDE; bool SetColumn( int col, const wxListItem& item ) wxOVERRIDE;
int GetColumnWidth( int col ) const wxOVERRIDE; int GetColumnWidth( int col ) const wxOVERRIDE;
bool SetColumnWidth( int col, int width) wxOVERRIDE; bool SetColumnWidth( int col, int width) wxOVERRIDE;
// Column ordering functions
int GetColumnOrder(int col) const wxOVERRIDE;
int GetColumnIndexFromOrder(int order) const wxOVERRIDE;
wxArrayInt GetColumnsOrder() const wxOVERRIDE;
bool SetColumnsOrder(const wxArrayInt& orders) wxOVERRIDE;
int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think
wxRect GetViewRect() const; wxRect GetViewRect() const;

8
include/wx/listbase.h
View File

@@ -399,6 +399,14 @@ public:
virtual int GetColumnWidth(int col) const = 0; virtual int GetColumnWidth(int col) const = 0;
virtual bool SetColumnWidth(int col, int width) = 0; virtual bool SetColumnWidth(int col, int width) = 0;
// Column ordering functions
virtual int GetColumnOrder(int col) const = 0;
virtual int GetColumnIndexFromOrder(int order) const = 0;
virtual wxArrayInt GetColumnsOrder() const = 0;
virtual bool SetColumnsOrder(const wxArrayInt& orders) = 0;
// Other miscellaneous accessors. // Other miscellaneous accessors.
// ------------------------------ // ------------------------------

8
include/wx/msw/listctrl.h
View File

@@ -129,14 +129,14 @@ public:
// Gets the column order from its index or index from its order // Gets the column order from its index or index from its order
int GetColumnOrder(int col) const; int GetColumnOrder(int col) const wxOVERRIDE;
int GetColumnIndexFromOrder(int order) const; int GetColumnIndexFromOrder(int order) const wxOVERRIDE;
// Gets the column order for all columns // Gets the column order for all columns
wxArrayInt GetColumnsOrder() const; wxArrayInt GetColumnsOrder() const wxOVERRIDE;
// Sets the column order for all columns // Sets the column order for all columns
bool SetColumnsOrder(const wxArrayInt& orders); bool SetColumnsOrder(const wxArrayInt& orders) wxOVERRIDE;
// Gets the number of items that can fit vertically in the // Gets the number of items that can fit vertically in the

8
include/wx/qt/listctrl.h
View File

@@ -60,14 +60,14 @@ public:
// Gets the column order from its index or index from its order // Gets the column order from its index or index from its order
int GetColumnOrder(int col) const; int GetColumnOrder(int col) const wxOVERRIDE;
int GetColumnIndexFromOrder(int order) const; int GetColumnIndexFromOrder(int order) const wxOVERRIDE;
// Gets the column order for all columns // Gets the column order for all columns
wxArrayInt GetColumnsOrder() const; wxArrayInt GetColumnsOrder() const wxOVERRIDE;
// Sets the column order for all columns // Sets the column order for all columns
bool SetColumnsOrder(const wxArrayInt& orders); bool SetColumnsOrder(const wxArrayInt& orders) wxOVERRIDE;
// Gets the number of items that can fit vertically in the // Gets the number of items that can fit vertically in the

25
src/generic/listctrl.cpp
View File

@@ -5162,6 +5162,31 @@ bool wxGenericListCtrl::SetColumnWidth( int col, int width )
return true; return true;
} }
// Column ordering functions
int wxGenericListCtrl::GetColumnOrder(int col) const
{
// TODO: Implement this on generic port
return col;
}
int wxGenericListCtrl::GetColumnIndexFromOrder(int order) const
{
// TODO: Implement this on generic port
return order;
}
wxArrayInt wxGenericListCtrl::GetColumnsOrder() const
{
// TODO: Implement this on generic port
return wxArrayInt();
}
bool wxGenericListCtrl::SetColumnsOrder(const wxArrayInt& WXUNUSED(orders))
{
// TODO: Implement this on generic port
return false;
}
int wxGenericListCtrl::GetCountPerPage() const int wxGenericListCtrl::GetCountPerPage() const
{ {
return m_mainWin->GetCountPerPage(); // different from Windows ? return m_mainWin->GetCountPerPage(); // different from Windows ?