diff options
| -rw-r--r-- | src/corelib/x11/gfx_x11.pas | 2 | ||||
| -rw-r--r-- | src/gui/fpgui_package.lpk | 1 | ||||
| -rw-r--r-- | src/gui/gui_customgrid.pas | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/x11/gfx_x11.pas b/src/corelib/x11/gfx_x11.pas index bb0097f4..7b08f151 100644 --- a/src/corelib/x11/gfx_x11.pas +++ b/src/corelib/x11/gfx_x11.pas @@ -1699,7 +1699,7 @@ begin end; // Xft uses smallint to return text extent information, so we have to // check if the text width is small enough to fit into smallint range - if DoGetTextWidthClassic('W') * Length(txt) < High(smallint) then + if DoGetTextWidthClassic('W') * UTF8Length(txt) < High(smallint) then Result := DoGetTextWidthClassic(txt) else Result := DoGetTextWidthWorkaround(txt); diff --git a/src/gui/fpgui_package.lpk b/src/gui/fpgui_package.lpk index 62d2a480..cf9d8736 100644 --- a/src/gui/fpgui_package.lpk +++ b/src/gui/fpgui_package.lpk @@ -159,6 +159,7 @@ </Item32> <Item33> <Filename Value="gui_panel.pas"/> + <UnitName Value="gui_panel"/> </Item33> </Files> <LazDoc Paths="../../docs/xml/gui/"/> diff --git a/src/gui/gui_customgrid.pas b/src/gui/gui_customgrid.pas index 42f41fe2..1ed59e6f 100644 --- a/src/gui/gui_customgrid.pas +++ b/src/gui/gui_customgrid.pas @@ -170,7 +170,7 @@ begin // removing columns while n > AValue do begin - DoDeleteColumn(n); + DoDeleteColumn(n-1); dec(n); end; end; |