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

Gtk2: added missing result in gtk2trayicon, cleanup of unused variables, fixed compiler warnings

Browse Source 
git-svn-id: trunk@35675 -
This commit is contained in:
zeljko 2012-03-03 16:13:08 +00:00
parent 37056b6883
commit aaa6a65283
6 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/interfaces/gtk2/gtk2callback.inc
View File

@ -1462,7 +1462,7 @@ begin
if g_object_get_data(PGObject(AGtkWidget),'lcl-column-resized-dblclick') <> nil then
begin
AIndex := PtrInt(g_object_get_data(PGObject(AGtkWidget),'lcl-column-resized-dblclick') - 1);
ASizing := TGtkTreeViewColumnSizing(PtrInt(g_object_get_data(PGObject(AGtkWidget),'lcl-column-resized-dblclick-oldsizing')) - 1);
ASizing := TGtkTreeViewColumnSizing(PtrUInt(g_object_get_data(PGObject(AGtkWidget),'lcl-column-resized-dblclick-oldsizing')) - 1);
g_object_set_data(PGObject(AGtkWidget),'lcl-column-resized-dblclick', nil);
g_object_set_data(PGObject(AGtkWidget),'lcl-column-resized-dblclick-oldsizing', nil);
if (AIndex >= 0) then
@ -1678,9 +1678,9 @@ var
Info: PWidgetInfo;
Old: TObject;
Mess: TLMessage;
{ $IFDEF VerboseMouseBugfix}
{$IFDEF VerboseMouseBugfix}
AWinControl: TWinControl;
{ $ENDIF}
{$ENDIF}
begin
Result := CallBackDefaultReturn;

1
lcl/interfaces/gtk2/gtk2trayicon.inc
View File

@ -343,6 +343,7 @@ function button_release_cb_statusicon(status_icon: PGtkStatusIcon;
var
vwsTrayIcon: TCustomTrayIcon absolute user_data;
begin
Result := False;
case PGdkEventButton(event)^.button of
1:
begin

4
lcl/interfaces/gtk2/gtk2widgetset.inc
View File

@ -4339,7 +4339,7 @@ var
nitemsReturned: PtrInt;
unused: PtrInt;
data: Pointer;
Screen: PGdkScreen;
// Screen: PGdkScreen;
begin
Result := '';
@ -4347,7 +4347,7 @@ begin
if Display = nil then
exit;
Screen := gdk_screen_get_default;
// Screen := gdk_screen_get_default;
RootWin := gdk_x11_get_default_root_xwindow;
WMAtom := XInternAtom(Display,'_NET_WM_DESKTOP', True);

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

@ -35,8 +35,6 @@
{off $define VerboseScrollWindowEx}
const
BOOL_TEXT: array[Boolean] of string = ('False', 'True');
//##apiwiz##sps## // Do not remove

1
lcl/interfaces/gtk2/gtk2wscontrols.pp
View File

@ -976,7 +976,6 @@ var
procedure PaintWidget(AWidget: PGtkWidget);
var
AOffset: TPoint;
AWindow: PGdkWindow;
begin
if (AWinControl.FCompStyle = csForm) then

1
lcl/interfaces/gtk2/gtk2wsextctrls.pp
View File

@ -245,7 +245,6 @@ end;
class procedure TGtk2WSCustomPanel.SetColor(const AWinControl: TWinControl);
var
MainWidget: PGtkWidget;
FontColor, BGColor: TColor;
begin
if not AWinControl.HandleAllocated then exit;
MainWidget:=GetFixedWidget(pGtkWidget(AWinControl.handle));