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

lcl: gtk3: less hints

Browse Source 
git-svn-id: trunk@65102 -
This commit is contained in:
mattias 2021-05-10 14:08:08 +00:00
parent 69249de79e
commit 5e8a217e0d
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lcl/interfaces/gtk3/gtk3widgets.pas
View File

@ -267,7 +267,7 @@ type
TGtk3Range = class(TGtk3Widget) TGtk3Range = class(TGtk3Widget)
private private
function GetPosition: Integer; function GetPosition: Integer; reintroduce;
function GetRange: TPoint; function GetRange: TPoint;
procedure SetPosition(AValue: Integer); procedure SetPosition(AValue: Integer);
procedure SetRange(AValue: TPoint); procedure SetRange(AValue: TPoint);
@ -310,7 +310,7 @@ type
TGtk3ProgressBar = class(TGtk3Widget) TGtk3ProgressBar = class(TGtk3Widget)
private private
function GetOrientation: TProgressBarOrientation; function GetOrientation: TProgressBarOrientation;
function GetPosition: Integer; function GetPosition: Integer; reintroduce;
function GetShowText: Boolean; function GetShowText: Boolean;
function GetStyle: TProgressBarStyle; function GetStyle: TProgressBarStyle;
procedure SetOrientation(AValue: TProgressBarOrientation); procedure SetOrientation(AValue: TProgressBarOrientation);
@ -372,8 +372,8 @@ type
function getText: String; override; function getText: String; override;
function CreateWidget(const Params: TCreateParams):PGtkWidget; override; function CreateWidget(const Params: TCreateParams):PGtkWidget; override;
procedure DestroyWidget; override; procedure DestroyWidget; override;
function getClientOffset:TPoint;override;
public public
function getClientOffset:TPoint;override;
function getClientRect: TRect; override; function getClientRect: TRect; override;
end; end;
@ -540,8 +540,8 @@ type
protected protected
function CreateWidget(const {%H-}Params: TCreateParams):PGtkWidget; override; function CreateWidget(const {%H-}Params: TCreateParams):PGtkWidget; override;
function EatArrowKeys(const {%H-}AKey: Word): Boolean; override; function EatArrowKeys(const {%H-}AKey: Word): Boolean; override;
procedure InitializeWidget; override;
public public
procedure InitializeWidget; override;
function getHorizontalScrollbar: PGtkScrollbar; override; function getHorizontalScrollbar: PGtkScrollbar; override;
function getVerticalScrollbar: PGtkScrollbar; override; function getVerticalScrollbar: PGtkScrollbar; override;
function GetScrolledWindow: PGtkScrolledWindow; override; function GetScrolledWindow: PGtkScrolledWindow; override;
@ -727,8 +727,8 @@ type
private private
protected protected
function CreateWidget(const {%H-}Params: TCreateParams):PGtkWidget; override; function CreateWidget(const {%H-}Params: TCreateParams):PGtkWidget; override;
procedure InitializeWidget; override;
public public
procedure InitializeWidget; override;
end; end;
{ TGtk3CustomControl } { TGtk3CustomControl }
@ -844,18 +844,17 @@ type
TGtk3FontSelectionDialog = class(TGtk3Dialog) TGtk3FontSelectionDialog = class(TGtk3Dialog)
protected protected
procedure InitializeWidget; override; function response_handler(resp_id:gint):boolean; override;
function response_handler(resp_id:gint):boolean;override;
public public
procedure InitializeWidget; override;
constructor Create(const ACommonDialog: TCommonDialog); virtual; overload; constructor Create(const ACommonDialog: TCommonDialog); virtual; overload;
end; end;
{ TGtk3ColorSelectionDialog } { TGtk3ColorSelectionDialog }
TGtk3ColorSelectionDialog = class(TGtk3Dialog) TGtk3ColorSelectionDialog = class(TGtk3Dialog)
protected
procedure InitializeWidget;override;
public public
procedure InitializeWidget; override;
constructor Create(const ACommonDialog: TCommonDialog); virtual; overload; constructor Create(const ACommonDialog: TCommonDialog); virtual; overload;
end; end;
@ -962,7 +961,7 @@ begin
end; end;
end; end;
function Gtk3MenuItemEvent(widget: PGtkWidget; event: PGdkEvent; data: GPointer): gboolean; cdecl; function Gtk3MenuItemEvent({%H-}widget: PGtkWidget; event: PGdkEvent; {%H-}data: GPointer): gboolean; cdecl;
begin begin
Result := False; Result := False;
@ -1067,8 +1066,6 @@ end;
const act_count:integer=0; const act_count:integer=0;
function Gtk3WidgetEvent(widget: PGtkWidget; event: PGdkEvent; data: GPointer): gboolean; cdecl; function Gtk3WidgetEvent(widget: PGtkWidget; event: PGdkEvent; data: GPointer): gboolean; cdecl;
var
NotifyUserInput:boolean;
begin begin
{$IFDEF GTK3DEBUGCOMBOBOX} {$IFDEF GTK3DEBUGCOMBOBOX}
if (Data <> nil) and (wtComboBox in TGtk3Widget(Data).WidgetType) and if (Data <> nil) and (wtComboBox in TGtk3Widget(Data).WidgetType) and
@ -1366,6 +1363,8 @@ begin
with ARect do with ARect do
DebugLn(' Rect ',Format('x %d y %d w %d h %d',[Left,Top,Right - Left, Bottom - Top])); DebugLn(' Rect ',Format('x %d y %d w %d h %d',[Left,Top,Right - Left, Bottom - Top]));
{$ENDIF} {$ENDIF}
if ARect.Left<ARect.Right then ;
AWindow := AWidget^.get_window; AWindow := AWidget^.get_window;
// at least TPanel needs this // at least TPanel needs this
if Gtk3IsGdkWindow(AWindow) and (g_object_get_data(AWindow,'lclwidget') = nil) then if Gtk3IsGdkWindow(AWindow) and (g_object_get_data(AWindow,'lclwidget') = nil) then
@ -1408,11 +1407,11 @@ end;
procedure Gtk3SizeAllocate(AWidget: PGtkWidget; AGdkRect: PGdkRectangle; Data: gpointer); cdecl; procedure Gtk3SizeAllocate(AWidget: PGtkWidget; AGdkRect: PGdkRectangle; Data: gpointer); cdecl;
var var
Msg: TLMSize; Msg: TLMSize;
MoveMsg: TLMMove;
NewSize: TSize; NewSize: TSize;
ACtl: TGtk3Widget; ACtl: TGtk3Widget;
AState:integer; AState:integer;
begin begin
if AWidget=nil then ;
//TODO: Move to TGtk3Widget.GtkResizeEvent //TODO: Move to TGtk3Widget.GtkResizeEvent
{$IFDEF GTK3DEBUGSIZE} {$IFDEF GTK3DEBUGSIZE}
with AGdkRect^ do with AGdkRect^ do
@ -1445,7 +1444,7 @@ begin
ACtl.LCLObject.DoAdjustClientRectChange; ACtl.LCLObject.DoAdjustClientRectChange;
end; end;
FillChar(Msg, SizeOf(Msg), #0); FillChar(Msg{%H-}, SizeOf(Msg), #0);
Msg.Msg := LM_SIZE; Msg.Msg := LM_SIZE;
Msg.SizeType := SIZE_RESTORED; Msg.SizeType := SIZE_RESTORED;
@ -1515,7 +1514,7 @@ begin
Gtk3SizeAllocate(AWidget, @ARect, Data); Gtk3SizeAllocate(AWidget, @ARect, Data);
end; end;
procedure Gtk3WidgetHide(AWidget: PGtkWidget; AData: gpointer); cdecl; procedure Gtk3WidgetHide({%H-}AWidget: PGtkWidget; AData: gpointer); cdecl;
var var
Msg: TLMShowWindow; Msg: TLMShowWindow;
Gtk3Widget: TGtk3Widget; Gtk3Widget: TGtk3Widget;
@ -1525,7 +1524,7 @@ begin
if Gtk3Widget.inUpdate then if Gtk3Widget.inUpdate then
exit; exit;
// DebugLn('SEND LM_HIDE FOR ',dbgsName(Gtk3Widget.LCLObject)); // DebugLn('SEND LM_HIDE FOR ',dbgsName(Gtk3Widget.LCLObject));
FillChar(Msg, SizeOf(Msg), #0); FillChar(Msg{%H-}, SizeOf(Msg), #0);
Msg.Msg := LM_SHOWWINDOW; Msg.Msg := LM_SHOWWINDOW;
Msg.Show := False; Msg.Show := False;
@ -1533,7 +1532,7 @@ begin
Gtk3Widget.DeliverMessage(Msg); Gtk3Widget.DeliverMessage(Msg);
end; end;
procedure Gtk3WidgetShow(AWidget: PGtkWidget; AData: gpointer); cdecl; procedure Gtk3WidgetShow({%H-}AWidget: PGtkWidget; AData: gpointer); cdecl;
var var
Msg: TLMShowWindow; Msg: TLMShowWindow;
Gtk3Widget: TGtk3Widget; Gtk3Widget: TGtk3Widget;
@ -1543,7 +1542,7 @@ begin
if Gtk3Widget.inUpdate then if Gtk3Widget.inUpdate then
exit; exit;
// DebugLn('SEND LM_SHOW FOR ',dbgsName(Gtk3Widget.LCLObject)); // DebugLn('SEND LM_SHOW FOR ',dbgsName(Gtk3Widget.LCLObject));
FillChar(Msg, SizeOf(Msg), #0); FillChar(Msg{%H-}, SizeOf(Msg), #0);
Msg.Msg := LM_SHOWWINDOW; Msg.Msg := LM_SHOWWINDOW;
Msg.Show := True; Msg.Show := True;
@ -1630,7 +1629,7 @@ begin
else else
SmallPos := High(SmallPos); SmallPos := High(SmallPos);
ScrollBar := HWND(PtrUInt(AData)); ScrollBar := HWND({%H-}PtrUInt(AData));
ScrollCode := SB_THUMBPOSITION; ScrollCode := SB_THUMBPOSITION;
end; end;
Result := TGtk3Widget(AData).DeliverMessage(Msg) <> 0; Result := TGtk3Widget(AData).DeliverMessage(Msg) <> 0;
@ -1647,6 +1646,7 @@ var
MessE : TLMMouseEvent; MessE : TLMMouseEvent;
begin begin
Result := False; Result := False;
if AWidget=nil then ;
AWinControl := TGtk3Widget(AData).LCLObject; AWinControl := TGtk3Widget(AData).LCLObject;
if AEvent^.scroll.send_event = NO_PROPAGATION_TO_PARENT then if AEvent^.scroll.send_event = NO_PROPAGATION_TO_PARENT then
@ -1668,7 +1668,7 @@ begin
//DebugLn('gtkMouseWheelCB ',DbgSName(AWinControl),' Mapped=',dbgs(MappedXY.X),',',dbgs(MappedXY.Y),' Event=',dbgs(EventXY.X),',',dbgs(EventXY.Y)); //DebugLn('gtkMouseWheelCB ',DbgSName(AWinControl),' Mapped=',dbgs(MappedXY.X),',',dbgs(MappedXY.Y),' Event=',dbgs(EventXY.X),',',dbgs(EventXY.Y));
// this is a mouse wheel event // this is a mouse wheel event
FillChar(MessE,SizeOf(MessE),0); FillChar(MessE{%H-},SizeOf(MessE),0);
MessE.Msg := LM_MOUSEWHEEL; MessE.Msg := LM_MOUSEWHEEL;
case AEvent^.scroll.direction of case AEvent^.scroll.direction of
0 {GDK_SCROLL_UP}: MessE.WheelDelta := 120; 0 {GDK_SCROLL_UP}: MessE.WheelDelta := 120;
@ -2950,6 +2950,7 @@ begin
width := AWidth; width := AWidth;
height := AHeight; height := AHeight;
end; end;
BeginUpdate; BeginUpdate;
try try
{fixes gtk3 assertion} {fixes gtk3 assertion}
@ -6527,11 +6528,11 @@ begin
APrivate := PGtkComboBoxPrivate(AComboWidget^.priv3); APrivate := PGtkComboBoxPrivate(AComboWidget^.priv3);
DebugLn('** COMBO DUMP OF PGtkComboBoxPrivate struct EVENT=',ADbgEvent); DebugLn('** COMBO DUMP OF PGtkComboBoxPrivate struct EVENT=',ADbgEvent);
DebugLn('BUTTON=',dbgHex(PtrUInt(APrivate^.button)),' ARROW=',dbgHex(PtrUInt(APrivate^.arrow)), DebugLn('BUTTON=',dbgHex(PtrUInt(APrivate^.button)),' ARROW=',dbgHex(PtrUInt(APrivate^.arrow)),
' SCROLLEDWINDOW=',dbgHex(PtrUInt(APrivate^.scrolled_window)), ' SCROLLEDWINDOW=',dbgHex({%H-}PtrUInt(APrivate^.scrolled_window)),
' CELLVIEW=',dbgHex(PtrUInt(APrivate^.cell_view)), ' CELLVIEW=',dbgHex({%H-}PtrUInt(APrivate^.cell_view)),
' CELLAREA=',dbgHex(PtrUInt(APrivate^.area))); ' CELLAREA=',dbgHex({%H-}PtrUInt(APrivate^.area)));
DebugLn(' PrivatePopupW ',dbgHex(PtrUInt(APrivate^.popup_widget)), DebugLn(' PrivatePopupW ',dbgHex({%H-}PtrUInt(APrivate^.popup_widget)),
' PrivatePopupWin ',dbgHex(PtrUInt(APrivate^.popup_window)),' TreeView ',dbgHex(PtrUInt(APrivate^.tree_view))); ' PrivatePopupWin ',dbgHex({%H-}PtrUInt(APrivate^.popup_window)),' TreeView ',dbgHex({%H-}PtrUInt(APrivate^.tree_view)));
if Gtk3IsWidget(APrivate^.popup_widget) then if Gtk3IsWidget(APrivate^.popup_widget) then
begin begin
DebugLn('POPUPWIDGET VISIBLE ',dbgs(APrivate^.popup_widget^.get_visible), DebugLn('POPUPWIDGET VISIBLE ',dbgs(APrivate^.popup_widget^.get_visible),
@ -6619,7 +6620,7 @@ begin
end; end;
end; end;
procedure Gtk3ComboMenuRealized(AWidget: PGtkWidget; AData: gPointer); cdecl; procedure Gtk3ComboMenuRealized({%H-}AWidget: PGtkWidget; AData: gPointer); cdecl;
begin begin
DebugLn('Gtk3ComboMenuRealized *****',dbgsName(TGtk3ComboBox(AData).LCLObject)); DebugLn('Gtk3ComboMenuRealized *****',dbgsName(TGtk3ComboBox(AData).LCLObject));
end; end;
@ -6810,7 +6811,7 @@ begin
end; end;
{ TGtk3ToggleButton } { TGtk3ToggleButton }
procedure Gtk3Toggled(AWidget: PGtkToggleButton; AData: gPointer); cdecl; procedure Gtk3Toggled({%H-}AWidget: PGtkToggleButton; AData: gPointer); cdecl;
var var
Msg: TLMessage; Msg: TLMessage;
begin begin