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

fixed changing menuitem separator and normal

Browse Source 
git-svn-id: trunk@2412 -
This commit is contained in:
mattias 2002-08-17 23:41:21 +00:00
parent 27c1fa5151
commit d8fa211334
1 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2539,64 +2539,59 @@ begin
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
procedure SetMenuItemLabelText(LCLMenuItem: TMenuItem; procedure UpdateInnerMenuItem(LCLMenuItem: TMenuItem;
MenuItemWidget: PGtkWidget); MenuItemWidget: PGtkWidget);
Sets the caption of a menuitem Update the inner widgets of a menuitem widget.
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure SetMenuItemLabelText(LCLMenuItem: TMenuItem; procedure UpdateInnerMenuItem(LCLMenuItem: TMenuItem;
MenuItemWidget: PGtkWidget);
var
ShortCutPos: integer;
s: string;
LabelWidget: PGtkLabel;
begin
if (MenuItemWidget=nil) or (LCLMenuItem=nil) then exit;
LabelWidget:=gtk_object_get_data(PGtkObject(MenuItemWidget), 'LCLLabel');
if LabelWidget=nil then exit;
//Check for a shortcut key
s:=LCLMenuItem.Caption;
ShortCutPos := pos('&', s);
if ShortCutPos <> 0 then begin
if (LCLMenuItem.Parent<>nil)
and (LCLMenuItem.Parent.HandleAllocated)
and GtkWidgetIsA(PGtkWidget(LCLMenuItem.Parent.Handle),GTK_MENU_BAR_TYPE)
then begin
// this is a menu item in the main bar of a form
// -> accelerator should be Alt+Key
s[ShortCutPos] := '_';
Accelerate(LCLMenuItem,MenuItemWidget,
gtk_label_parse_uline(LabelWidget,PChar(s)),
GDK_MOD1_MASK,'activate_item');
end else begin
// Because gnome changes menuitem shortcuts via keyboard, we can't
// set the accelerator.
// It would be cool, to know if a window manager with the gnome feature
// is running, but there is probably no reliable code to do that, so we
// simply delete all ampersands and don't set the letter shortcut.
DeleteAmpersands(s);
gtk_label_set_text(LabelWidget,PChar(s));
{Accelerate(LCLMenuItem,MenuItemWidget,
gtk_label_parse_uline(LabelWidget,PChar(s)),0,'activate_item');}
end;
end
else begin
gtk_label_set_text(LabelWidget,PChar(s));
end;
end;
{------------------------------------------------------------------------------
procedure CreateInnerMenuItem(LCLMenuItem: TMenuItem;
MenuItemWidget: PGtkWidget);
Creates the inner widgets of a menuitem widget.
------------------------------------------------------------------------------}
procedure CreateInnerMenuItem(LCLMenuItem: TMenuItem;
MenuItemWidget: PGtkWidget); MenuItemWidget: PGtkWidget);
var var
HBoxWidget: PGtkWidget; HBoxWidget: PGtkWidget;
LabelWidget: PGtkAccelLabel; LabelWidget: PGtkAccelLabel;
procedure SetMenuItemLabelText(LCLMenuItem: TMenuItem;
MenuItemWidget: PGtkWidget);
var
ShortCutPos: integer;
s: string;
LabelWidget: PGtkLabel;
begin
if (MenuItemWidget=nil) or (LCLMenuItem=nil) then exit;
LabelWidget:=gtk_object_get_data(PGtkObject(MenuItemWidget), 'LCLLabel');
if LabelWidget=nil then begin
end;
//Check for a shortcut key
s:=LCLMenuItem.Caption;
ShortCutPos := pos('&', s);
if ShortCutPos <> 0 then begin
if (LCLMenuItem.Parent<>nil)
and (LCLMenuItem.Parent.HandleAllocated)
and GtkWidgetIsA(PGtkWidget(LCLMenuItem.Parent.Handle),GTK_MENU_BAR_TYPE)
then begin
// this is a menu item in the main bar of a form
// -> accelerator should be Alt+Key
s[ShortCutPos] := '_';
Accelerate(LCLMenuItem,MenuItemWidget,
gtk_label_parse_uline(LabelWidget,PChar(s)),
GDK_MOD1_MASK,'activate_item');
end else begin
// Because gnome changes menuitem shortcuts via keyboard, we can't
// set the accelerator.
// It would be cool, to know if a window manager with the gnome feature
// is running, but there is probably no reliable code to do that, so we
// simply delete all ampersands and don't set the letter shortcut.
DeleteAmpersands(s);
gtk_label_set_text(LabelWidget,PChar(s));
{Accelerate(LCLMenuItem,MenuItemWidget,
gtk_label_parse_uline(LabelWidget,PChar(s)),0,'activate_item');}
end;
end
else begin
gtk_label_set_text(LabelWidget,PChar(s));
end;
end;
procedure CreateIcon; procedure CreateIcon;
var var
IconImg, IconMask: PGdkPixmap; IconImg, IconMask: PGdkPixmap;
@ -2707,7 +2702,7 @@ begin
gtk_menu_item_right_justify(PGtkMenuItem(MenuItemWidget)); gtk_menu_item_right_justify(PGtkMenuItem(MenuItemWidget));
// create the hbox containing the label and the control // create the hbox containing the label and the control
CreateInnerMenuItem(LCLMenuItem,MenuItemWidget); UpdateInnerMenuItem(LCLMenuItem,MenuItemWidget);
gtk_widget_show(MenuItemWidget); gtk_widget_show(MenuItemWidget);
Result:=MenuItemWidget; Result:=MenuItemWidget;
@ -3241,7 +3236,7 @@ var
TempWidget, TempWidget,
TempWidget2 : Pointer; TempWidget2 : Pointer;
begin begin
// Create the VBox, we need that to place controls outside // Create the VBox. We need that to place controls outside
// the client area (like menu and the statusbar) // the client area (like menu and the statusbar)
Result := gtk_vbox_new(False, 0); Result := gtk_vbox_new(False, 0);
If FormWidget = nil then If FormWidget = nil then
@ -4068,6 +4063,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.171 2003/05/01 11:44:03 mattias
fixed changing menuitem separator and normal
Revision 1.170 2003/04/26 10:45:34 mattias Revision 1.170 2003/04/26 10:45:34 mattias
fixed right control release fixed right control release