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

redirecting gtk accelerator to a dummy callback, since the LCL handles menu shortcuts

Browse Source 
git-svn-id: trunk@8445 -
This commit is contained in:
mattias 2006-01-04 18:51:05 +00:00
parent 8201f274a8
commit ee624a05ee
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/gtk/gtkcallback.inc
View File

@ -299,8 +299,8 @@ begin
if GtkWidgetIsA(Widget, gtk_window_get_type) then
Mess.ActiveWindow:=HWnd(PGTKWindow(Widget)^.focus_widget);
Mess.Result := 0;
//DebugLn('gtkactivateCB ',DbgSName(TObject(Data)));
DeliverMessage(Data, Mess);
//DebugLn('gtkactivateCB ',TWinControl(Data).Name,':',TWinControl(Data).ClassName);
Result := CallBackDefaultReturn;
end;

2
lcl/interfaces/gtk/gtkproc.inc
View File

@ -4942,7 +4942,7 @@ begin
else begin
{$IfDef GTK2}
Assert(GtkWidgetIsA(Widget,GTK_TYPE_WINDOW));
gtk_window_add_accel_group(GTK_WINDOW(widget), AnAccelGroup)
gtk_window_add_accel_group(GTK_WINDOW(widget), AnAccelGroup);
{$else}
gtk_accel_group_attach(AnAccelGroup, PGtkObject(Widget));
{$endif}

6
lcl/interfaces/gtk/gtkwsmenus.pp
View File

@ -174,7 +174,11 @@ procedure TGtkWSMenuItem.SetShortCut(const AMenuItem: TMenuItem;
const OldShortCut, NewShortCut: TShortCut);
begin
Accelerate(AMenuItem, PGtkWidget(AMenuItem.Handle), NewShortcut,
{$Ifdef GTK2}'activate'{$Else}'activate_item'{$EndIF});
// The LCL already delegates the menu shortcuts.
// just call a dummy callback
'grab-focus'
//{$Ifdef GTK2}'activate'{$Else}'activate_item'{$EndIF}
);
end;
procedure TGtkWSMenuItem.SetVisible(const AMenuItem: TMenuItem;