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

* Fix compilation problem with GTK2

Browse Source 
git-svn-id: trunk@5985 -
This commit is contained in:
mazen 2004-09-12 19:09:08 +00:00
parent 94751cbfd6
commit bce63b1126
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcl/interfaces/gtk2/gtk2int.pas
View File

@ -49,14 +49,14 @@ uses
type type
TGtk2WidgetSet = class(TGtkWidgetSet) TGtk2WidgetSet = class(TGtkWidgetSet)
protected protected
procedure AppendText(Sender: TObject; Str: PChar); override; procedure AppendText(Sender: TObject; Str: PChar);
function CreateComponent(Sender : TObject): THandle; override; function CreateComponent(Sender : TObject): THandle; override;
function GetText(Sender: TComponent; var Text: String): Boolean; override; function GetText(Sender: TComponent; var Text: String): Boolean;
procedure HookSignals(const AGTKObject: PGTKObject; const ALCLObject: TObject); override; procedure HookSignals(const AGTKObject: PGTKObject; const ALCLObject: TObject); override;
function IntSendMessage3(LM_Message : Integer; Sender : TObject; data : pointer) : integer; override; function IntSendMessage3(LM_Message : Integer; Sender : TObject; data : pointer) : integer; override;
function LoadStockPixmap(StockID: longint) : HBitmap; override; function LoadStockPixmap(StockID: longint) : HBitmap; override;
procedure SetCallback(const AMsg: LongInt; const AGTKObject: PGTKObject; const ALCLObject: TObject);override; procedure SetCallback(const AMsg: LongInt; const AGTKObject: PGTKObject; const ALCLObject: TObject);override;
procedure SetLabel(Sender : TObject; Data : Pointer); override; procedure SetLabel(Sender : TObject; Data : Pointer);
function SetProperties(Sender : TObject) : integer; override; function SetProperties(Sender : TObject) : integer; override;
procedure SetSelectionMode(Sender: TObject; Widget: PGtkWidget; procedure SetSelectionMode(Sender: TObject; Widget: PGtkWidget;
MultiSelect, ExtendedSelect: boolean); override; MultiSelect, ExtendedSelect: boolean); override;
@ -594,6 +594,9 @@ end.
{ {
$Log$ $Log$
Revision 1.34 2004/09/12 19:08:35 mazen
* Fix compilation problem with GTK2
Revision 1.33 2004/08/18 09:31:21 mattias Revision 1.33 2004/08/18 09:31:21 mattias
removed obsolete unit vclglobals removed obsolete unit vclglobals

25
lcl/interfaces/gtk2/gtk2object.inc
View File

@ -192,8 +192,8 @@ begin
gtk_text_buffer_insert(aTextBuffer, @aTextIter2, str, StrLen(str)); gtk_text_buffer_insert(aTextBuffer, @aTextIter2, str, StrLen(str));
gtk_text_buffer_end_user_action(aTextBuffer); gtk_text_buffer_end_user_action(aTextBuffer);
end; end;
else {else
inherited AppendText(Sender, Str); inherited AppendText(Sender, Str);}
end; end;
end; end;
end; end;
@ -348,8 +348,8 @@ begin
Text := StrPas(CS); Text := StrPas(CS);
g_free(CS); g_free(CS);
end; end;
else {else
Result := inherited GetText(Sender, Text); Result := inherited GetText(Sender, Text);}
end; end;
end; end;
@ -438,7 +438,7 @@ begin
handle := hwnd(ObjectToGtkObject(Sender)); handle := hwnd(ObjectToGtkObject(Sender));
Case LM_Message of Case LM_Message of
LM_CLB_GETCHECKED : (* LM_CLB_GETCHECKED :
begin begin
Result := 0; Result := 0;
if Assigned(Data) if Assigned(Data)
@ -457,9 +457,9 @@ begin
result := 1; result := 1;
end; end;
end; end;
end; end; *)
LM_CLB_SETCHECKED : (*LM_CLB_SETCHECKED :
begin begin
if Assigned(Data) if Assigned(Data)
and (Sender is TControl) and (Sender is TControl)
@ -474,7 +474,7 @@ begin
then then
gtk_list_store_set(GTK_LIST_STORE(aTreeModel), @aTreeIter, [0, TLMSetChecked(Data^).Checked, -1]); gtk_list_store_set(GTK_LIST_STORE(aTreeModel), @aTreeIter, [0, TLMSetChecked(Data^).Checked, -1]);
end; end;
end; end;*)
LM_GETITEMINDEX : LM_GETITEMINDEX :
begin begin
@ -985,7 +985,7 @@ var
AccelKey : integer; AccelKey : integer;
begin begin
if Sender is TMenuItem then begin if Sender is TMenuItem then begin
inherited SetLabel(Sender, Data); //inherited SetLabel(Sender, Data);
exit; exit;
end; end;
@ -1054,8 +1054,8 @@ begin
gtk_text_buffer_insert(aTextBuffer, @aTextIter1, pLabel, StrLen(pLabel)); gtk_text_buffer_insert(aTextBuffer, @aTextIter1, pLabel, StrLen(pLabel));
gtk_text_buffer_end_user_action(aTextBuffer); gtk_text_buffer_end_user_action(aTextBuffer);
end; end;
else {else
inherited SetLabel(Sender, Data); inherited SetLabel(Sender, Data);}
end; end;
Assert(False, Format('trace: [TGtk2WidgetSet.SetLabel] %s --> END', [Sender.ClassName])); Assert(False, Format('trace: [TGtk2WidgetSet.SetLabel] %s --> END', [Sender.ClassName]));
end; end;
@ -1375,6 +1375,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.17 2004/09/12 19:09:08 mazen
* Fix compilation problem with GTK2
Revision 1.16 2004/09/08 16:20:24 mazen Revision 1.16 2004/09/08 16:20:24 mazen
* Commenting removed messages * Commenting removed messages
* Can someone please verify they can be removed please? * Can someone please verify they can be removed please?