mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-18 17:19:23 +02:00
AJ: More changes for better code reuse between gnome & gtk interfaces
git-svn-id: trunk@1345 -
This commit is contained in:
parent
cce47eb0b1
commit
d3e86ec1ca
@ -195,21 +195,34 @@ end;
|
||||
|
||||
procedure TGnomeObject.CreateComponent(Sender : TObject);
|
||||
var
|
||||
Caption : AnsiString;
|
||||
StrTemp : PChar; // same as "caption" but as PChar
|
||||
TempWidget,
|
||||
TempWidget2 : PGTKWidget; // pointer to gtk-widget (local use when neccessary)
|
||||
p : pointer; // ptr to the newly created GtkWidget
|
||||
Box : Pointer; // currently only used for TBitBtn and TForm and TListView
|
||||
ParentForm: TCustomForm;
|
||||
CompStyle : Longint;
|
||||
DoFinishComp,
|
||||
SetupProps : Boolean;
|
||||
begin
|
||||
if (Sender is TCustomForm) and (TControl(Sender).FCompStyle = csForm) then begin
|
||||
With (Sender as TCustomForm) do begin
|
||||
P := nil;
|
||||
DoFinishComp := True;
|
||||
SetupProps := False;
|
||||
|
||||
CompStyle := GetCompStyle(Sender);
|
||||
Caption := GetCaption(Sender);
|
||||
strTemp := nil;
|
||||
|
||||
Case CompStyle of
|
||||
csForm:
|
||||
begin
|
||||
Assert(Sender is TCustomForm);
|
||||
With TCustomForm(Sender) do begin
|
||||
If Caption > '' then begin
|
||||
strTemp := StrAlloc(length(Caption) + 1);
|
||||
StrPCopy(strTemp, Caption);
|
||||
end
|
||||
else
|
||||
strTemp := nil;
|
||||
end;
|
||||
|
||||
P := GNOME_APP_NEW(Argv[0], strTemp);
|
||||
gnome_app_enable_layout_config(p, True);
|
||||
@ -248,24 +261,9 @@ begin
|
||||
Drag_Icon := gdk_pixmap_colormap_create_from_xpm_d (nil,
|
||||
gtk_widget_get_colormap (p), @Drag_Mask,
|
||||
nil, @IMGDrag_Icon);
|
||||
|
||||
SetLCLObject(p, Sender);
|
||||
gtk_object_set_data(pgtkObject(p),'Style',0);
|
||||
gtk_object_set_data(pgtkObject(p),'ExStyle',0);
|
||||
|
||||
Handle := THandle(p);
|
||||
gtk_object_set_data(pgtkobject(p),'Sender',Sender);
|
||||
SetResizeRequest(p);
|
||||
|
||||
Set_RC_Name(sender, p);
|
||||
|
||||
StrDispose(StrTemp);
|
||||
gtk_widget_set_app_paintable(p,true);
|
||||
HookSignals(Sender);
|
||||
end;
|
||||
end
|
||||
else
|
||||
If (Sender is TMenu) and (TMenu(Sender).FCompStyle = csMainMenu) then
|
||||
end;
|
||||
csMainMenu:
|
||||
begin
|
||||
p := gtk_menu_bar_new();
|
||||
ParentForm:=TCustomForm(TMenu(Sender).Parent);
|
||||
@ -275,16 +273,22 @@ begin
|
||||
RaiseException('form has already a MainMenu');
|
||||
gtk_widget_show(p);
|
||||
gnome_app_set_menus(Pointer(ParentForm.Handle), p);
|
||||
TMenu(Sender).Items.Handle := HMenu(p);
|
||||
end
|
||||
else begin
|
||||
end;
|
||||
else
|
||||
begin
|
||||
inherited CreateComponent(Sender);
|
||||
DoFinishComp := False;
|
||||
end;
|
||||
end;
|
||||
|
||||
If (Sender is TCustomEdit) then
|
||||
With (Sender as TCustomEdit) do
|
||||
If Popupmenu = nil then
|
||||
If Pointer(Handle) <> nil then
|
||||
gnome_widget_add_help(Pointer(Handle), nil)
|
||||
end;
|
||||
gnome_widget_add_help(Pointer(Handle), nil);
|
||||
|
||||
If DoFinishComp then
|
||||
FinishComponentCreate(Sender, P, SetupProps);
|
||||
end;
|
||||
|
||||
{$I gnomewinapi.inc}
|
||||
@ -293,6 +297,9 @@ end.
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.10 2002/10/24 22:10:39 lazarus
|
||||
AJ: More changes for better code reuse between gnome & gtk interfaces
|
||||
|
||||
Revision 1.9 2002/10/23 20:47:27 lazarus
|
||||
AJ: Started Form Scrolling
|
||||
Started StaticText FocusControl
|
||||
|
Loading…
Reference in New Issue
Block a user