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

Fix wxGrid::SetColSize for the native header

Browse Source 
In case of the width of -1 for the native header the title width must be
calculated by the native header itself.
This commit is contained in:
Ilya Sinitsyn
2019-10-01 12:31:01 +07:00
parent f7e335c031
commit 6ed0443d2f
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/generic/grid.cpp
View File

@@ -9127,6 +9127,12 @@ void wxGrid::SetColSize( int col, int width )
// make the code more complex), and for them passing -1 simply means to // make the code more complex), and for them passing -1 simply means to
// show the column back using its old size. // show the column back using its old size.
if ( width == -1 && GetColWidth(col) != 0 ) if ( width == -1 && GetColWidth(col) != 0 )
{
if ( m_useNativeHeader )
{
width = GetGridColHeader()->GetColumnTitleWidth(col);
}
else
{ {
long w, h; long w, h;
wxArrayString lines; wxArrayString lines;
@@ -9138,6 +9144,7 @@ void wxGrid::SetColSize( int col, int width )
else else
GetTextBoxSize( dc, lines, &h, &w ); GetTextBoxSize( dc, lines, &h, &w );
width = w + 6; width = w + 6;
}
// Check that it is not less than the minimal width and do use the // Check that it is not less than the minimal width and do use the
// possibly greater than minimal-acceptable-width minimal-width itself // possibly greater than minimal-acceptable-width minimal-width itself