paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-16 07:40:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Renamed TGtk2Object to TGtk2WidgetSet

Browse Source 
git-svn-id: trunk@5262 -
This commit is contained in:
marc 2004-03-05 00:41:15 +00:00
parent c89d1927a0
commit a2bfc9390a
5 changed files with 109 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ uses
gtkDef, gtkProc, gtkInt;
type
TGtk2Object = class(TGtkWidgetSet)
TGtk2WidgetSet = class(TGtkWidgetSet)
protected
procedure AppendText(Sender: TObject; Str: PChar); override;
procedure CreateComponent(Sender : TObject); override;
@ -561,6 +561,9 @@ end.
{
$Log$
Revision 1.29 2004/03/05 00:41:15 marc
* Renamed TGtk2Object to TGtk2WidgetSet
Revision 1.28 2004/03/05 00:31:53 marc
* Renamed TGtkObject to TGtkWidgetSet

94
lcl/interfaces/gtk2/gtk2lclintf.inc
View File

@ -38,7 +38,7 @@
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.AlignmentCreateHandle(const AAlignment: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.AlignmentCreateHandle(const AAlignment: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -50,7 +50,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.ArrowCreateHandle(const AArrow: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.ArrowCreateHandle(const AArrow: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -62,7 +62,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.BitBtnCreateHandle(const ABitBtn: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.BitBtnCreateHandle(const ABitBtn: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -74,7 +74,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.ButtonCreateHandle(const AButton: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.ButtonCreateHandle(const AButton: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -86,7 +86,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.CalendarCreateHandle(const ACalendar: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.CalendarCreateHandle(const ACalendar: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -98,7 +98,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.CheckboxCreateHandle(const ACheckBox: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.CheckboxCreateHandle(const ACheckBox: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -110,7 +110,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.CheckListBoxCreateHandle(const ACheckListBox: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.CheckListBoxCreateHandle(const ACheckListBox: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -122,7 +122,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.CListBoxCreateHandle(const ACListBox: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.CListBoxCreateHandle(const ACListBox: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -133,7 +133,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.ColorDialogCreateHandle(const AColorDialog: TObject): THandle;
function TGtk2WidgetSet.ColorDialogCreateHandle(const AColorDialog: TObject): THandle;
begin
// Your code here
end;
@ -145,7 +145,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.ComboBoxCreateHandle(const AComboBox: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.ComboBoxCreateHandle(const AComboBox: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -157,7 +157,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.EditCreateHandle(const AEdit: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.EditCreateHandle(const AEdit: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -168,7 +168,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.FileDialogCreateHandle(const AFileDialog: TObject): THandle;
function TGtk2WidgetSet.FileDialogCreateHandle(const AFileDialog: TObject): THandle;
begin
// Your code here
end;
@ -179,7 +179,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.FontDialogCreateHandle(const AFontDialog: TObject): THandle;
function TGtk2WidgetSet.FontDialogCreateHandle(const AFontDialog: TObject): THandle;
begin
// Your code here
end;
@ -191,7 +191,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.FormCreateHandle(const AForm: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.FormCreateHandle(const AForm: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -203,7 +203,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.GroupBoxCreateHandle(const AGroupBox: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.GroupBoxCreateHandle(const AGroupBox: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -215,7 +215,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.HintWindowCreateHandle(const AHintWindow: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.HintWindowCreateHandle(const AHintWindow: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -227,7 +227,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.ImageCreateHandle(const AImage: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.ImageCreateHandle(const AImage: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -239,7 +239,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.LabelCreateHandle(const ALabel: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.LabelCreateHandle(const ALabel: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -251,7 +251,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.ListBoxCreateHandle(const AListBox: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.ListBoxCreateHandle(const AListBox: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -263,7 +263,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.ListViewCreateHandle(const AListView: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.ListViewCreateHandle(const AListView: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -274,7 +274,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.MainMenuCreateHandle(const AMainMenu: TObject): THandle;
function TGtk2WidgetSet.MainMenuCreateHandle(const AMainMenu: TObject): THandle;
begin
// Your code here
end;
@ -286,7 +286,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.MemoCreateHandle(const AMemo: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.MemoCreateHandle(const AMemo: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -297,7 +297,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.MenuItemCreateHandle(const AMenuItem: TObject): THandle;
function TGtk2WidgetSet.MenuItemCreateHandle(const AMenuItem: TObject): THandle;
begin
// Your code here
end;
@ -309,7 +309,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.NotebookCreateHandle(const ANotebook: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.NotebookCreateHandle(const ANotebook: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -320,7 +320,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.OpenFileDialogCreateHandle(const AOpenFileDialog: TObject): THandle;
function TGtk2WidgetSet.OpenFileDialogCreateHandle(const AOpenFileDialog: TObject): THandle;
begin
// Your code here
end;
@ -332,7 +332,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.PageCreateHandle(const APage: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.PageCreateHandle(const APage: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -344,7 +344,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.PairSplitterCreateHandle(const APairSplitter: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.PairSplitterCreateHandle(const APairSplitter: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -356,7 +356,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.PairSplitterSideCreateHandle(const APairSplitterSide: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.PairSplitterSideCreateHandle(const APairSplitterSide: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -368,7 +368,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.PanelCreateHandle(const APanel: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.PanelCreateHandle(const APanel: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -379,7 +379,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.PopupMenuCreateHandle(const APopupMenu: TObject): THandle;
function TGtk2WidgetSet.PopupMenuCreateHandle(const APopupMenu: TObject): THandle;
begin
// Your code here
end;
@ -390,7 +390,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.PreviewFileControlCreateHandle(const APreviewFileControl: TObject): THandle;
function TGtk2WidgetSet.PreviewFileControlCreateHandle(const APreviewFileControl: TObject): THandle;
begin
// Your code here
end;
@ -401,7 +401,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.PreviewFileDialogCreateHandle(const APreviewFileDialog: TObject): THandle;
function TGtk2WidgetSet.PreviewFileDialogCreateHandle(const APreviewFileDialog: TObject): THandle;
begin
// Your code here
end;
@ -413,7 +413,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.ProgressBarCreateHandle(const AProgressBar: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.ProgressBarCreateHandle(const AProgressBar: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -425,7 +425,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.RadioButtonCreateHandle(const ARadioButton: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.RadioButtonCreateHandle(const ARadioButton: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -436,7 +436,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.SaveFileDialogCreateHandle(const ASaveFileDialog: TObject): THandle;
function TGtk2WidgetSet.SaveFileDialogCreateHandle(const ASaveFileDialog: TObject): THandle;
begin
// Your code here
end;
@ -448,7 +448,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.ScrollBarCreateHandle(const AScrollBar: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.ScrollBarCreateHandle(const AScrollBar: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -460,7 +460,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.ScrollBoxCreateHandle(const AScrollBox: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.ScrollBoxCreateHandle(const AScrollBox: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -472,7 +472,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.ScrolledWindowCreateHandle(const AScrolledWindow: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.ScrolledWindowCreateHandle(const AScrolledWindow: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -483,7 +483,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.SelectDirectoryDialogCreateHandle(const ASelectDirectoryDialog: TObject): THandle;
function TGtk2WidgetSet.SelectDirectoryDialogCreateHandle(const ASelectDirectoryDialog: TObject): THandle;
begin
// Your code here
end;
@ -495,7 +495,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.SpeedButtonCreateHandle(const ASpeedButton: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.SpeedButtonCreateHandle(const ASpeedButton: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -507,7 +507,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.SpineditCreateHandle(const ASpinEdit: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.SpineditCreateHandle(const ASpinEdit: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -519,7 +519,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.StatusBarCreateHandle(const AStatusBar: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.StatusBarCreateHandle(const AStatusBar: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -531,7 +531,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.ToggleBoxCreateHandle(const AToggleBox: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.ToggleBoxCreateHandle(const AToggleBox: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -543,7 +543,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.ToolbarCreateHandle(const AToolbar: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.ToolbarCreateHandle(const AToolbar: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -555,7 +555,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.ToolButtonCreateHandle(const AToolButton: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.ToolButtonCreateHandle(const AToolButton: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -567,7 +567,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.TrackBarCreateHandle(const ATrackBar: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.TrackBarCreateHandle(const ATrackBar: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;
@ -579,7 +579,7 @@ end;
Returns:
------------------------------------------------------------------------------}
function TGTK2Object.WincontrolCreateHandle(const AFixed: TObject; const AParams: TCreateParams): THandle;
function TGtk2WidgetSet.WincontrolCreateHandle(const AFixed: TObject; const AParams: TCreateParams): THandle;
begin
// Your code here
end;

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

@ -1,5 +1,5 @@
{******************************************************************************
TGTK2Object
TGtk2WidgetSet
******************************************************************************
*****************************************************************************
@ -175,9 +175,9 @@ end;
{$EndIf}
{------------------------------------------------------------------------------
procedure Tgtk2Object.AppendText(Sender: TObject; Str: PChar);
procedure TGtk2WidgetSet.AppendText(Sender: TObject; Str: PChar);
------------------------------------------------------------------------------}
procedure Tgtk2Object.AppendText(Sender: TObject; Str: PChar);
procedure TGtk2WidgetSet.AppendText(Sender: TObject; Str: PChar);
var
Widget : PGtkWidget;
aTextBuffer : PGtkTextBuffer;
@ -203,7 +203,7 @@ begin
end;
end;
procedure Tgtk2Object.CreateComponent(Sender : TObject);
procedure TGtk2WidgetSet.CreateComponent(Sender : TObject);
var
Caption : ansistring; // the caption of "Sender"
StrTemp : PChar; // same as "caption" but as PChar
@ -327,7 +327,7 @@ begin
FinishComponentCreate(Sender, P, SetupProps);
end;
function TGtk2Object.GetText(Sender: TComponent; var Text: String): Boolean;
function TGtk2WidgetSet.GetText(Sender: TComponent; var Text: String): Boolean;
var
CS: PChar;
Widget : PGtkWidget;
@ -357,7 +357,7 @@ begin
end;
end;
procedure Tgtk2Object.HookSignals(Sender: TObject);
procedure TGtk2WidgetSet.HookSignals(Sender: TObject);
begin
if (Sender is TWinControl) then
Begin
@ -395,7 +395,7 @@ begin
end;
{------------------------------------------------------------------------------
Method: TGtk2Object.IntSendMessage3
Method: TGtk2WidgetSet.IntSendMessage3
Params: LM_Message - message to be processed by GTK2
Sender - sending control
data - pointer to (optional)
@ -406,7 +406,7 @@ end;
WARNING: the result of this function sometimes is not always really an
integer!!!!!
------------------------------------------------------------------------------}
function Tgtk2Object.IntSendMessage3(LM_Message : Integer; Sender : TObject;
function TGtk2WidgetSet.IntSendMessage3(LM_Message : Integer; Sender : TObject;
data : pointer) : integer;
var
handle : hwnd; // handle of sender
@ -428,7 +428,7 @@ begin
Assert(False, 'Trace:Message received');
if Sender <> nil then
Assert(False, Format('Trace: [Tgtk2Object.IntSendMessage3] %s --> Sent LM_Message: $%x (%s); Data: %d', [Sender.ClassName, LM_Message, GetMessageName(LM_Message), Integer(data)]));
Assert(False, Format('Trace: [TGtk2WidgetSet.IntSendMessage3] %s --> Sent LM_Message: $%x (%s); Data: %d', [Sender.ClassName, LM_Message, GetMessageName(LM_Message), Integer(data)]));
// The following case is now split into 2 separate parts:
// 1st part should contain all messages which don't need the "handle" variable
@ -804,14 +804,14 @@ begin
end;
{------------------------------------------------------------------------------
Function: TGTK2Object.SetCallback
Function: TGtk2WidgetSet.SetCallback
Params: Msg - message for which to set a callback
sender - object to which callback will be send
Returns: nothing
Applies a Message to the sender
------------------------------------------------------------------------------}
procedure TGTK2Object.SetCallback(Msg : LongInt; Sender: TObject);
procedure TGtk2WidgetSet.SetCallback(Msg : LongInt; Sender: TObject);
procedure ConnectSenderSignal(const AnObject:PGTKObject; const ASignal: PChar;
const ACallBackProc: Pointer);
@ -910,7 +910,7 @@ begin
end;
end;
Function TGtk2Object.LoadStockPixmap(StockID: longint) : HBitmap;
Function TGtk2WidgetSet.LoadStockPixmap(StockID: longint) : HBitmap;
var
Pixmap : PGDIObject;
StockName : PChar;
@ -966,14 +966,14 @@ begin
end;
{------------------------------------------------------------------------------
Method: TGtk2Object.SetLabel
Method: TGtk2WidgetSet.SetLabel
Params: sender - the calling object
data - String (PChar) to be set as label for a control
Returns: Nothing
Sets the label text on a widget
------------------------------------------------------------------------------}
procedure Tgtk2Object.SetLabel(Sender : TObject; Data : Pointer);
procedure TGtk2WidgetSet.SetLabel(Sender : TObject; Data : Pointer);
var
Widget : PGtkWidget;
aTextBuffer : PGtkTextBuffer;
@ -990,15 +990,15 @@ begin
end;
if Sender is TWinControl
then Assert(False, Format('Trace: [Tgtk2Object.SetLabel] %s --> label %s', [Sender.ClassName, TControl(Sender).Caption]))
then Assert(False, Format('Trace: [TGtk2WidgetSet.SetLabel] %s --> label %s', [Sender.ClassName, TControl(Sender).Caption]))
else begin
Assert(False, Format('Trace:WARNING: [Tgtk2Object.SetLabel] %s --> No Decendant of TWinControl', [Sender.ClassName]));
RaiseException('[Tgtk2Object.SetLabel] ERROR: Sender ('+Sender.Classname+')'
Assert(False, Format('Trace:WARNING: [TGtk2WidgetSet.SetLabel] %s --> No Decendant of TWinControl', [Sender.ClassName]));
RaiseException('[TGtk2WidgetSet.SetLabel] ERROR: Sender ('+Sender.Classname+')'
+' is not TWinControl ');
end;
Widget := PGtkWidget(TWinControl(Sender).Handle);
Assert(Widget = nil, 'Trace:WARNING: [Tgtk2Object.SetLabel] --> got nil pointer');
Assert(Widget = nil, 'Trace:WARNING: [TGtk2WidgetSet.SetLabel] --> got nil pointer');
Assert(False, 'Trace:Setting Str1 in SetLabel');
pLabel := pchar(Data);
@ -1057,18 +1057,18 @@ begin
else
inherited SetLabel(Sender, Data);
end;
Assert(False, Format('trace: [Tgtk2Object.SetLabel] %s --> END', [Sender.ClassName]));
Assert(False, Format('trace: [TGtk2WidgetSet.SetLabel] %s --> END', [Sender.ClassName]));
end;
{------------------------------------------------------------------------------
Method: TGtk2Object.SetProperties
Method: TGtk2WidgetSet.SetProperties
Params: Sender : the lcl object which called this func via SenMessage
Returns: currently always 0
Depending on the compStyle, this function will apply all properties of
the calling object to the corresponding GTK2 object.
------------------------------------------------------------------------------}
function Tgtk2Object.SetProperties(Sender : TObject) : integer;
function TGtk2WidgetSet.SetProperties(Sender : TObject) : integer;
const
cLabelAlignX : array[TAlignment] of gfloat = (0.0, 1.0, 0.5);
cLabelAlignY : array[TTextLayout] of gfloat = (0.0, 0.5, 1.0);
@ -1085,9 +1085,9 @@ begin
if Sender is TWinControl
then
Assert(False, Format('Trace: [Tgtk2Object.SetProperties] %s', [Sender.ClassName]))
Assert(False, Format('Trace: [TGtk2WidgetSet.SetProperties] %s', [Sender.ClassName]))
else
RaiseException('Tgtk2Object.SetProperties: '
RaiseException('TGtk2WidgetSet.SetProperties: '
+' Sender.ClassName='+Sender.ClassName);
wHandle:= Pointer(TWinControl(Sender).Handle);
@ -1167,10 +1167,10 @@ begin
end;
{------------------------------------------------------------------------------
procedure Tgtk2Object.SetSelectionMode(Sender: TObject; Widget: PGtkWidget;
procedure TGtk2WidgetSet.SetSelectionMode(Sender: TObject; Widget: PGtkWidget;
MultiSelect, ExtendedSelect: boolean);
------------------------------------------------------------------------------}
procedure Tgtk2Object.SetSelectionMode(Sender: TObject; Widget: PGtkWidget;
procedure TGtk2WidgetSet.SetSelectionMode(Sender: TObject; Widget: PGtkWidget;
MultiSelect, ExtendedSelect: boolean);
var
AControl: TWinControl;
@ -1201,10 +1201,10 @@ begin
end;
{------------------------------------------------------------------------------
function Tgtk2Object.SetTopIndex(Sender: TObject; NewTopIndex: integer
function TGtk2WidgetSet.SetTopIndex(Sender: TObject; NewTopIndex: integer
): integer;
------------------------------------------------------------------------------}
function Tgtk2Object.SetTopIndex(Sender: TObject; NewTopIndex: integer
function TGtk2WidgetSet.SetTopIndex(Sender: TObject; NewTopIndex: integer
): integer;
var
aTreeView: PGtkTreeView;
@ -1243,9 +1243,9 @@ begin
end;
{------------------------------------------------------------------------------
procedure Tgtk2Object.UpdateDCTextMetric(DC: TDeviceContext);
procedure TGtk2WidgetSet.UpdateDCTextMetric(DC: TDeviceContext);
------------------------------------------------------------------------------}
procedure Tgtk2Object.UpdateDCTextMetric(DC: TDeviceContext);
procedure TGtk2WidgetSet.UpdateDCTextMetric(DC: TDeviceContext);
const
TestString = '{Am|g_}';
var
@ -1285,7 +1285,7 @@ begin
StrikeOut := CurrentFont^.StrikeOut;
end;
If UseFontDesc = nil then
WriteLn('WARNING: [Tgtk2Object.GetTextMetrics] Missing font')
WriteLn('WARNING: [TGtk2WidgetSet.GetTextMetrics] Missing font')
else begin
Layout := gtk_widget_create_pango_layout (GetStyleWidget('default'), nil);
pango_layout_set_font_description(Layout, UseFontDesc);
@ -1375,6 +1375,9 @@ end;
{ =============================================================================
$Log$
Revision 1.8 2004/03/05 00:41:15 marc
* Renamed TGtk2Object to TGtk2WidgetSet
Revision 1.7 2004/01/04 16:44:33 mattias
updated gtk2 package

45
lcl/interfaces/gtk2/gtk2winapi.inc
View File

@ -36,7 +36,7 @@ const
//##apiwiz##sps## // Do not remove
function Tgtk2Object.BeginPaint(Handle: hWnd; Var PS : TPaintStruct) : hdc;
function TGtk2WidgetSet.BeginPaint(Handle: hWnd; Var PS : TPaintStruct) : hdc;
var
paintrect : TGDKRectangle;
begin
@ -58,7 +58,7 @@ begin
end;
end;
function Tgtk2Object.CreateFontIndirectEx(const LogFont: TLogFont;
function TGtk2WidgetSet.CreateFontIndirectEx(const LogFont: TLogFont;
const LongFontName: string): HFONT;
var
GdiObject: PGdiObject;
@ -179,7 +179,7 @@ end;
inherited routine apears to work fine so, turned off for now. Doesn't work
properly, and needs to take & into account before its fully useable....
------------------------------------------------------------------------------}
function TGTK2Object.PangoDrawText(DC: HDC; Str: PChar; Count: Integer; var Rect: TRect; Flags: Cardinal): Integer;
function TGtk2WidgetSet.PangoDrawText(DC: HDC; Str: PChar; Count: Integer; var Rect: TRect; Flags: Cardinal): Integer;
Function Alignment : TPangoAlignment;
begin
@ -218,7 +218,7 @@ begin
exit;
if (Str=nil) or (Str[0]=#0) then exit;
Assert(False, Format('trace:> [Tgtk2Object.DrawText] DC:0x%x, Str:''%s'', Count: %d, Rect = %d,%d,%d,%d, Flags:%d',
Assert(False, Format('trace:> [TGtk2WidgetSet.DrawText] DC:0x%x, Str:''%s'', Count: %d, Rect = %d,%d,%d,%d, Flags:%d',
[DC, Str, Count, Rect.Left, Rect.Top, Rect.Right, Rect.Bottom, Flags]));
Result := Longint(IsValidDC(DC));
@ -227,7 +227,7 @@ begin
begin
if GC = nil
then begin
WriteLn('WARNING: [Tgtk2Object.DrawText] Uninitialized GC');
WriteLn('WARNING: [TGtk2WidgetSet.DrawText] Uninitialized GC');
Result := 0;
end
else begin
@ -327,11 +327,11 @@ begin
end;
end;
end;
Assert(False, Format('trace:> [Tgtk2Object.DrawText] DC:0x%x, Str:''%s'', Count: %d, Rect = %d,%d,%d,%d, Flags:%d',
Assert(False, Format('trace:> [TGtk2WidgetSet.DrawText] DC:0x%x, Str:''%s'', Count: %d, Rect = %d,%d,%d,%d, Flags:%d',
[DC, Str, Count, Rect.Left, Rect.Top, Rect.Right, Rect.Bottom, Flags]));
end;
Function Tgtk2Object.EndPaint(Handle : hwnd; var PS : TPaintStruct): Integer;
Function TGtk2WidgetSet.EndPaint(Handle : hwnd; var PS : TPaintStruct): Integer;
begin
If (Handle <> 0) and (not GTK_WIDGET_DOUBLE_BUFFERED((PGTKWidget(Handle)))) then
begin
@ -351,7 +351,7 @@ end;
------------------------------------------------------------------------------}
function Tgtk2Object.ExtTextOut(DC: HDC; X, Y: Integer; Options: Longint;
function TGtk2WidgetSet.ExtTextOut(DC: HDC; X, Y: Integer; Options: Longint;
Rect: PRect; Str: PChar; Count: Longint; Dx: PInteger): Boolean;
var
LineStart, LineEnd, StrEnd: PChar;
@ -426,19 +426,19 @@ var
end;
begin
Assert(False, Format('trace:> [Tgtk2Object.ExtTextOut] DC:0x%x, X:%d, Y:%d, Options:%d, Str:''%s'', Count: %d', [DC, X, Y, Options, Str, Count]));
Assert(False, Format('trace:> [TGtk2WidgetSet.ExtTextOut] DC:0x%x, X:%d, Y:%d, Options:%d, Str:''%s'', Count: %d', [DC, X, Y, Options, Str, Count]));
Result := IsValidDC(DC);
if Result
then with TDeviceContext(DC) do
begin
if GC = nil
then begin
WriteLn('WARNING: [Tgtk2Object.ExtTextOut] Uninitialized GC');
WriteLn('WARNING: [TGtk2WidgetSet.ExtTextOut] Uninitialized GC');
Result := False;
end
else if ((Options and (ETO_OPAQUE+ETO_CLIPPED)) <> 0)
and (Rect=nil) then begin
WriteLn('WARNING: [Tgtk2Object.ExtTextOut] Rect=nil');
WriteLn('WARNING: [TGtk2WidgetSet.ExtTextOut] Rect=nil');
Result := False;
end else begin
// TODO: implement other parameters.
@ -460,7 +460,7 @@ begin
GetStyle('default');
If (UseFontDesc = nil) or (GetStyleWidget('default')=nil) then
WriteLn('WARNING: [Tgtk2Object.ExtTextOut] Missing Font')
WriteLn('WARNING: [TGtk2WidgetSet.ExtTextOut] Missing Font')
else begin
// to reduce flickering calculate first and then paint
DCOrigin:=GetDCOffset(TDeviceContext(DC));
@ -468,7 +468,7 @@ begin
Layout := gtk_widget_create_pango_layout (GetStyleWidget('default'), nil);
If (Layout = nil) then
WriteLn('WARNING: [Tgtk2Object.ExtTextOut] Missing Pango Layout')
WriteLn('WARNING: [TGtk2WidgetSet.ExtTextOut] Missing Pango Layout')
else begin
pango_layout_set_font_description(Layout, UseFontDesc);
@ -556,7 +556,7 @@ begin
end;
end;
end;
Assert(False, Format('trace:< [Tgtk2Object.ExtTextOut] DC:0x%x, X:%d, Y:%d, Options:%d, Str:''%s'', Count: %d', [DC, X, Y, Options, Str, Count]));
Assert(False, Format('trace:< [TGtk2WidgetSet.ExtTextOut] DC:0x%x, X:%d, Y:%d, Options:%d, Str:''%s'', Count: %d', [DC, X, Y, Options, Str, Count]));
end;
{------------------------------------------------------------------------------
@ -565,7 +565,7 @@ end;
Returns: True if succesful
------------------------------------------------------------------------------}
function Tgtk2Object.GetCursorPos(var lpPoint: TPoint ): Boolean;
function TGtk2WidgetSet.GetCursorPos(var lpPoint: TPoint ): Boolean;
{$IfnDef GTK2_2} //we need a GTK2_2 FLAG somehow
{$IfNDef Win32}
var
@ -603,12 +603,12 @@ begin
then g_list_free(TopList);
{$Else}
// Win32 Todo
writeln('ToDo(Win32): Tgtk2object.GetCursorPos');
writeln('ToDo(Win32): TGtk2WidgetSet.GetCursorPos');
{$EndIf}
{$EndIf}
end;
function Tgtk2Object.GetTextExtentPoint(DC: HDC; Str: PChar; Count: Integer;
function TGtk2WidgetSet.GetTextExtentPoint(DC: HDC; Str: PChar; Count: Integer;
var Size: TSize): Boolean;
var
DCOrigin: TPoint;
@ -644,7 +644,7 @@ begin
end;
If UseFontDesc = nil then
WriteLn('WARNING: [Tgtk2Object.GetTextExtentPoint] Missing Font')
WriteLn('WARNING: [TGtk2WidgetSet.GetTextExtentPoint] Missing Font')
else begin
DCOrigin:=GetDCOffset(TDeviceContext(DC));
GetStyle('default');
@ -709,7 +709,7 @@ end;
Returns:
------------------------------------------------------------------------------}
Function TGTK2Object.TextOut(DC: HDC; X,Y : Integer; Str : Pchar;
Function TGtk2WidgetSet.TextOut(DC: HDC; X,Y : Integer; Str : Pchar;
Count: Integer) : Boolean;
var
DCOrigin: TPoint;
@ -732,7 +732,7 @@ begin
begin
if GC = nil
then begin
WriteLn('WARNING: [Tgtk2Object.TextOut] Uninitialized GC');
WriteLn('WARNING: [TGtk2WidgetSet.TextOut] Uninitialized GC');
end
else begin
if (CurrentFont = nil) or (CurrentFont^.GDIFontObject = nil)
@ -750,7 +750,7 @@ begin
end;
If UseFontDesc = nil then
WriteLn('WARNING: [Tgtk2Object.TextOut] Missing Font')
WriteLn('WARNING: [TGtk2WidgetSet.TextOut] Missing Font')
else begin
DCOrigin:=GetDCOffset(TDeviceContext(DC));
GetStyle('default');
@ -826,6 +826,9 @@ end;
{ =============================================================================
$Log$
Revision 1.7 2004/03/05 00:41:15 marc
* Renamed TGtk2Object to TGtk2WidgetSet
Revision 1.6 2004/02/04 12:48:17 mattias
added CLX colors

2
lcl/interfaces/gtk2/interfaces.pas
View File

@ -36,7 +36,7 @@ uses
Gtk2Int, Forms;
initialization
InterfaceObject := TGtk2Object.Create;
InterfaceObject := TGtk2WidgetSet.Create;
finalization
FreeInterfaceObject;