fixed changing menuitem separator and normal

git-svn-id: trunk@2412 -
This commit is contained in:
mattias 2002-08-17 23:41:21 +00:00
parent 27c1fa5151
commit d8fa211334

View File

@ -2539,11 +2539,17 @@ begin
end;
{------------------------------------------------------------------------------
procedure SetMenuItemLabelText(LCLMenuItem: TMenuItem;
procedure UpdateInnerMenuItem(LCLMenuItem: TMenuItem;
MenuItemWidget: PGtkWidget);
Sets the caption of a menuitem
Update the inner widgets of a menuitem widget.
------------------------------------------------------------------------------}
procedure UpdateInnerMenuItem(LCLMenuItem: TMenuItem;
MenuItemWidget: PGtkWidget);
var
HBoxWidget: PGtkWidget;
LabelWidget: PGtkAccelLabel;
procedure SetMenuItemLabelText(LCLMenuItem: TMenuItem;
MenuItemWidget: PGtkWidget);
var
@ -2553,7 +2559,8 @@ var
begin
if (MenuItemWidget=nil) or (LCLMenuItem=nil) then exit;
LabelWidget:=gtk_object_get_data(PGtkObject(MenuItemWidget), 'LCLLabel');
if LabelWidget=nil then exit;
if LabelWidget=nil then begin
end;
//Check for a shortcut key
s:=LCLMenuItem.Caption;
ShortCutPos := pos('&', s);
@ -2585,18 +2592,6 @@ begin
end;
end;
{------------------------------------------------------------------------------
procedure CreateInnerMenuItem(LCLMenuItem: TMenuItem;
MenuItemWidget: PGtkWidget);
Creates the inner widgets of a menuitem widget.
------------------------------------------------------------------------------}
procedure CreateInnerMenuItem(LCLMenuItem: TMenuItem;
MenuItemWidget: PGtkWidget);
var
HBoxWidget: PGtkWidget;
LabelWidget: PGtkAccelLabel;
procedure CreateIcon;
var
IconImg, IconMask: PGdkPixmap;
@ -2707,7 +2702,7 @@ begin
gtk_menu_item_right_justify(PGtkMenuItem(MenuItemWidget));
// create the hbox containing the label and the control
CreateInnerMenuItem(LCLMenuItem,MenuItemWidget);
UpdateInnerMenuItem(LCLMenuItem,MenuItemWidget);
gtk_widget_show(MenuItemWidget);
Result:=MenuItemWidget;
@ -3241,7 +3236,7 @@ var
TempWidget,
TempWidget2 : Pointer;
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)
Result := gtk_vbox_new(False, 0);
If FormWidget = nil then
@ -4068,6 +4063,9 @@ end;
{ =============================================================================
$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
fixed right control release