paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 13:40:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt: fixed memleaks with TQtMenuBar under macosx, added forgoten scancodes into latest patch for macosx.

Browse Source 
git-svn-id: trunk@34178 -
This commit is contained in:
zeljko 2011-12-14 12:30:03 +00:00
parent 6dab5d669e
commit 4df5e7288b
1 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
lcl/interfaces/qt/qtwidgets.pas
View File

@ -2797,33 +2797,36 @@ begin
(Modifiers = QtShiftModifier or QtControlModifier) then
begin
ScanCode := QKeyEvent_nativeVirtualKey(QKeyEventH(Event));
if ScanCode = 10 then
ScanCode := VK_UNDEFINED
else
if ScanCode in [18..21] then
ScanCode := ScanCode + 31
else
if ScanCode = 23 then
ScanCode := 53
else
if ScanCode = 22 then
ScanCode := 54
else
if ScanCode = 26 then
ScanCode := 55
else
if ScanCode = 28 then
ScanCode := 56
else
if ScanCode = 25 then
ScanCode := 57
else
if ScanCode = 29 then
ScanCode := 48;
if (length(Text) = 1) and (ScanCode in [10,18..23,25,26,28,29]) then
begin
if ScanCode = 10 then
ScanCode := VK_UNDEFINED
else
if ScanCode in [18..21] then
ScanCode := ScanCode + 31
else
if ScanCode = 23 then
ScanCode := 53
else
if ScanCode = 22 then
ScanCode := 54
else
if ScanCode = 26 then
ScanCode := 55
else
if ScanCode = 28 then
ScanCode := 56
else
if ScanCode = 25 then
ScanCode := 57
else
if ScanCode = 29 then
ScanCode := 48;
KeyMsg.CharCode := Word(ScanCode);
if (Modifiers = QtShiftModifier or QtControlModifier) then
Text := '';
KeyMsg.CharCode := Word(ScanCode);
if (Modifiers = QtShiftModifier or QtControlModifier) then
Text := '';
end;
end;
{$ELSE}
if (Modifiers = QtShiftModifier or QtControlModifier) or
@ -5363,14 +5366,7 @@ begin
Result := QMainWindow_create(nil, QtWindow);
{$ifdef darwin}
if csDesigning in LCLObject.ComponentState then
MenuBar := TQtMenuBar.Create(nil)
else
MenuBar := TQtMenuBar.Create(Result);
{$else}
MenuBar := TQtMenuBar.Create(Result);
{$endif}
MenuBar := TQtMenuBar.Create(Result);
if not (csDesigning in LCLObject.ComponentState) then
MenuBar.FIsApplicationMainMenu := True;
@ -5433,11 +5429,7 @@ begin
end;
// Main menu bar
{$ifdef darwin}
MenuBar := TQtMenuBar.Create(nil);
{$else}
MenuBar := TQtMenuBar.Create(Result);
{$endif}
MenuBar := TQtMenuBar.Create(Result);
FCentralWidget := QWidget_create(Result);
QWidget_setMouseTracking(FCentralWidget, True);