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

Merge branch 'grid-uitests-gtk'

Browse Source 
Fixes to wxUIActionSimulator allowing the tests using it to work for
wxGrid in wxGTK.

And some improvements and bug fixes to wxGrid itself.

Closes https://github.com/wxWidgets/wxWidgets/pull/1609
This commit is contained in:
Vadim Zeitlin
2019-10-21 21:12:01 +02:00
parent f867b04571 16619c5e77
commit ad6799f249
10 changed files with 389 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/generic/grid.h
View File

@@ -936,7 +936,7 @@ struct WXDLLIMPEXP_CORE wxGridSizesInfo
// wxGrid
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxGrid : public wxScrolledWindow
class WXDLLIMPEXP_CORE wxGrid : public wxScrolledCanvas
{
public:
// possible selection modes
@@ -1937,9 +1937,8 @@ public:
// override some base class functions
virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE
{ return (wxWindow*)m_gridWin; }
virtual void Fit() wxOVERRIDE;
virtual void SetFocus() wxOVERRIDE;
// implementation only
void CancelMouseCapture();
@@ -2277,7 +2276,7 @@ protected:
private:
// implement wxScrolledWindow method to return m_gridWin size
// implement wxScrolledCanvas method to return m_gridWin size
virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) wxOVERRIDE;
// depending on the values of m_numFrozenRows and m_numFrozenCols, it will