paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-15 08:59:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL-GTK3: Fix InputBox(). Issue #38710, patch from Anton Kavalenka.

Browse Source 
git-svn-id: trunk@65075 -
This commit is contained in:
juha 2021-04-30 20:59:26 +00:00
parent 8d82fd5325
commit c2fbfcd4c5
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lcl/interfaces/gtk3/gtk3winapi.inc
View File

@ -2938,6 +2938,16 @@ begin
Result:=HMONITOR(nmon+1); Result:=HMONITOR(nmon+1);
end; end;
function TGtk3WidgetSet.MonitorFromWindow(hWnd: HWND; dwFlags: DWord): HMONITOR;
var
pscr:PGdkScreen;
nmon:gint;
begin
pscr:=TGdkScreen.get_default;
nmon:=pscr^.get_monitor_at_window(TGtk3Widget(hWnd).GetWindow);
Result:=HMONITOR(nmon+1);
end;
function TGtk3WidgetSet.MoveToEx(DC: HDC; X, Y: Integer; OldPoint: PPoint function TGtk3WidgetSet.MoveToEx(DC: HDC; X, Y: Integer; OldPoint: PPoint
): Boolean; ): Boolean;
begin begin

1
lcl/interfaces/gtk3/gtk3winapih.inc
View File

@ -167,6 +167,7 @@ function LPtoDP(DC: HDC; var Points; Count: Integer): BOOL; override;
function MessageBox({%H-}hWnd: HWND; lpText, lpCaption: PChar; uType: Cardinal): integer; override; function MessageBox({%H-}hWnd: HWND; lpText, lpCaption: PChar; uType: Cardinal): integer; override;
function MonitorFromPoint(ptScreenCoords: TPoint; dwFlags: DWord): HMONITOR;override; function MonitorFromPoint(ptScreenCoords: TPoint; dwFlags: DWord): HMONITOR;override;
function MonitorFromWindow(hWnd: HWND; dwFlags: DWord): HMONITOR;override;
function MoveToEx(DC: HDC; X, Y: Integer; OldPoint: PPoint): Boolean; override; function MoveToEx(DC: HDC; X, Y: Integer; OldPoint: PPoint): Boolean; override;
function OffsetRgn(RGN: HRGN; nXOffset, nYOffset: Integer): Integer; override; function OffsetRgn(RGN: HRGN; nXOffset, nYOffset: Integer): Integer; override;

4
lcl/interfaces/gtk3/gtk3wsbuttons.pp
View File

@ -87,7 +87,7 @@ begin
DebugLn('TGtk3WSBitBtn.CreateHandle'); DebugLn('TGtk3WSBitBtn.CreateHandle');
{$ENDIF} {$ENDIF}
ABitBtn := TGtk3Button.Create(AWinControl, AParams); ABitBtn := TGtk3Button.Create(AWinControl, AParams);
with ARect do { with ARect do
begin begin
x := AWinControl.Left; x := AWinControl.Left;
y := AWinControl.Top; y := AWinControl.Top;
@ -95,7 +95,7 @@ begin
height := AWinControl.Height; height := AWinControl.Height;
end; end;
ABitBtn.Widget^.set_allocation(@ARect); ABitBtn.Widget^.set_allocation(@ARect);}
Result := TLCLIntfHandle(ABitBtn); Result := TLCLIntfHandle(ABitBtn);
{$IFDEF GTK3DEBUGCORE} {$IFDEF GTK3DEBUGCORE}