mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-07-23 07:06:12 +02:00
MG: fixed destroying combobox
git-svn-id: trunk@1981 -
This commit is contained in:
parent
2a419eaf2f
commit
7f7fb2cb15
@ -87,9 +87,10 @@ function gtkNoteBookCloseBtnClicked(Widget: PGtkWidget;
|
|||||||
Data: Pointer): GBoolean; cdecl;
|
Data: Pointer): GBoolean; cdecl;
|
||||||
var APage: TPage;
|
var APage: TPage;
|
||||||
begin
|
begin
|
||||||
|
Result:=true; // handled = true
|
||||||
|
if ComponentIsDestroyingHandle(TWinControl(Data)) then exit;
|
||||||
APage:=TPage(Data);
|
APage:=TPage(Data);
|
||||||
TCustomNoteBook(APage.Parent).DoCloseTabClicked(APage);
|
TCustomNoteBook(APage.Parent).DoCloseTabClicked(APage);
|
||||||
Result:=true; // handled = true
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{-------------------------------------------------------------------------------
|
{-------------------------------------------------------------------------------
|
||||||
@ -103,6 +104,7 @@ end;
|
|||||||
-------------------------------------------------------------------------------}
|
-------------------------------------------------------------------------------}
|
||||||
function gtkRealizeCB(Widget: PGtkWidget; Data: Pointer): GBoolean; cdecl;
|
function gtkRealizeCB(Widget: PGtkWidget; Data: Pointer): GBoolean; cdecl;
|
||||||
begin
|
begin
|
||||||
|
Result := True;
|
||||||
EventTrace('realize', nil);
|
EventTrace('realize', nil);
|
||||||
|
|
||||||
if Data<>nil then begin
|
if Data<>nil then begin
|
||||||
@ -113,8 +115,6 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
Result := True;
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{-------------------------------------------------------------------------------
|
{-------------------------------------------------------------------------------
|
||||||
@ -137,6 +137,7 @@ var
|
|||||||
ClientWidget: PGtkWidget;
|
ClientWidget: PGtkWidget;
|
||||||
MainWidget: PGtkWidget;
|
MainWidget: PGtkWidget;
|
||||||
begin
|
begin
|
||||||
|
Result := True;
|
||||||
EventTrace('realizeafter', nil);
|
EventTrace('realizeafter', nil);
|
||||||
|
|
||||||
HiddenLCLObject:=GetHiddenLCLObject(Widget);
|
HiddenLCLObject:=GetHiddenLCLObject(Widget);
|
||||||
@ -183,8 +184,6 @@ begin
|
|||||||
if HiddenLCLObject is TWinControl then
|
if HiddenLCLObject is TWinControl then
|
||||||
ConnectInternalWidgetsSignals(Widget,TWinControl(HiddenLCLObject));
|
ConnectInternalWidgetsSignals(Widget,TWinControl(HiddenLCLObject));
|
||||||
end;
|
end;
|
||||||
|
|
||||||
Result := True;
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function gtkshowCB( widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
|
function gtkshowCB( widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
|
||||||
@ -216,7 +215,7 @@ var
|
|||||||
Mess : TLMessage;
|
Mess : TLMessage;
|
||||||
LCLMenuItem: TMenuItem;
|
LCLMenuItem: TMenuItem;
|
||||||
begin
|
begin
|
||||||
Result:=true;
|
Result := True;
|
||||||
EventTrace('activate', data);
|
EventTrace('activate', data);
|
||||||
if GTK_IS_CHECK_MENU_ITEM(widget) then begin
|
if GTK_IS_CHECK_MENU_ITEM(widget) then begin
|
||||||
LCLMenuItem:=TMenuItem(GetLCLObject(Widget));
|
LCLMenuItem:=TMenuItem(GetLCLObject(Widget));
|
||||||
@ -250,6 +249,7 @@ var
|
|||||||
NewText: string;
|
NewText: string;
|
||||||
begin
|
begin
|
||||||
Result := True;
|
Result := True;
|
||||||
|
if ComponentIsDestroyingHandle(TWinControl(Data)) then exit;
|
||||||
EventTrace('changed', data);
|
EventTrace('changed', data);
|
||||||
|
|
||||||
if TObject(Data) is TControl then begin
|
if TObject(Data) is TControl then begin
|
||||||
@ -2279,6 +2279,9 @@ end;
|
|||||||
{ =============================================================================
|
{ =============================================================================
|
||||||
|
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 1.118 2002/08/31 11:37:10 lazarus
|
||||||
|
MG: fixed destroying combobox
|
||||||
|
|
||||||
Revision 1.117 2002/08/31 07:58:21 lazarus
|
Revision 1.117 2002/08/31 07:58:21 lazarus
|
||||||
MG: fixed resetting comobobox text
|
MG: fixed resetting comobobox text
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user