Fix the native header column minimal width determination

wxGrid::AutoSizeColumn can set per column minimal width and this values
must be used for native headers columns.
This commit is contained in:
Ilya Sinitsyn
2019-10-01 13:02:00 +07:00
committed by Vadim Zeitlin
parent 8971321542
commit b2194d9ad5
2 changed files with 2 additions and 1 deletions

View File

@@ -2282,6 +2282,7 @@ protected:
friend class wxGridWindow; friend class wxGridWindow;
friend class wxGridHeaderRenderer; friend class wxGridHeaderRenderer;
friend class wxGridHeaderColumn;
friend class wxGridHeaderCtrl; friend class wxGridHeaderCtrl;
private: private:

View File

@@ -95,7 +95,7 @@ public:
virtual wxString GetTitle() const wxOVERRIDE { return m_grid->GetColLabelValue(m_col); } virtual wxString GetTitle() const wxOVERRIDE { return m_grid->GetColLabelValue(m_col); }
virtual wxBitmap GetBitmap() const wxOVERRIDE { return wxNullBitmap; } virtual wxBitmap GetBitmap() const wxOVERRIDE { return wxNullBitmap; }
virtual int GetWidth() const wxOVERRIDE { return m_grid->GetColSize(m_col); } virtual int GetWidth() const wxOVERRIDE { return m_grid->GetColSize(m_col); }
virtual int GetMinWidth() const wxOVERRIDE { return m_grid->GetColMinimalAcceptableWidth(); } virtual int GetMinWidth() const wxOVERRIDE { return m_grid->GetColMinimalWidth(m_col); }
virtual wxAlignment GetAlignment() const wxOVERRIDE virtual wxAlignment GetAlignment() const wxOVERRIDE
{ {
int horz, int horz,