From 91eda267c1a5578425d371d4c914420d3627a03f Mon Sep 17 00:00:00 2001 From: zeljko Date: Fri, 30 Dec 2011 17:18:18 +0000 Subject: [PATCH] Gtk2: cleanup git-svn-id: trunk@34519 - --- lcl/interfaces/gtk2/gtk2callback.inc | 2 ++ lcl/interfaces/gtk2/gtk2lclintf.inc | 2 -- lcl/interfaces/gtk2/gtk2proc.inc | 4 +--- lcl/interfaces/gtk2/gtk2proc.pp | 2 +- lcl/interfaces/gtk2/gtk2widgetset.inc | 2 -- lcl/interfaces/gtk2/gtk2winapi.inc | 29 --------------------------- lcl/interfaces/gtk2/gtk2wsarrow.pp | 2 +- 7 files changed, 5 insertions(+), 38 deletions(-) diff --git a/lcl/interfaces/gtk2/gtk2callback.inc b/lcl/interfaces/gtk2/gtk2callback.inc index dd4f3dd14c..4ac76e813c 100644 --- a/lcl/interfaces/gtk2/gtk2callback.inc +++ b/lcl/interfaces/gtk2/gtk2callback.inc @@ -141,8 +141,10 @@ begin end; function FilterFuc(xevent: PGdkXEvent; event: PGdkEvent; data: gpointer): TGdkFilterReturn; cdecl; +{$ifdef windows} var AForm: TCustomForm absolute data; +{$endif} begin Result := GDK_FILTER_CONTINUE; {$ifdef windows} diff --git a/lcl/interfaces/gtk2/gtk2lclintf.inc b/lcl/interfaces/gtk2/gtk2lclintf.inc index ef09b4d7e0..ea3b8fbc7a 100644 --- a/lcl/interfaces/gtk2/gtk2lclintf.inc +++ b/lcl/interfaces/gtk2/gtk2lclintf.inc @@ -31,8 +31,6 @@ //##apiwiz##sps## // Do not remove function TGtk2WidgetSet.CreateRubberBand(const ARect: TRect; const ABrush: HBrush): HWND; -const - LineWidth = 2; var Widget: PGtkWidget absolute Result; dx, dy: integer; diff --git a/lcl/interfaces/gtk2/gtk2proc.inc b/lcl/interfaces/gtk2/gtk2proc.inc index fc367be2c3..2f39cf40dc 100644 --- a/lcl/interfaces/gtk2/gtk2proc.inc +++ b/lcl/interfaces/gtk2/gtk2proc.inc @@ -6792,7 +6792,7 @@ end; Returns the Left, Top, relative to the client origin of its parent -------------------------------------------------------------------------------} -procedure GetWidgetRelativePosition(aWidget: PGtkWidget; var Left, Top: integer); +procedure GetWidgetRelativePosition(aWidget: PGtkWidget; out Left, Top: integer); var GdkWindow: PGdkWindow; LCLControl: TWinControl; @@ -7600,7 +7600,6 @@ var var Tp : Pointer; l : Longint; - NoName: PGChar; lgs: TLazGtkStyle; WidgetName: String; AddToStyleWindow: Boolean; @@ -7648,7 +7647,6 @@ begin lgs:=lgsDefault; AddToStyleWindow:=false; AddReference:=false; - NoName:=nil; // GTK2 does not allow to instantiate the abstract base Widget // so we use the "invisible" widget, which should never be defined // by the theme. diff --git a/lcl/interfaces/gtk2/gtk2proc.pp b/lcl/interfaces/gtk2/gtk2proc.pp index fb48947784..47e7016d54 100644 --- a/lcl/interfaces/gtk2/gtk2proc.pp +++ b/lcl/interfaces/gtk2/gtk2proc.pp @@ -667,7 +667,7 @@ procedure SendCachedGtkResizeNotifications; procedure ResizeHandle(LCLControl: TWinControl); procedure SetWidgetSizeAndPosition(LCLControl: TWinControl);// for child controls procedure SetWindowSizeAndPosition(Window: PGtkWindow; AWinControl: TWinControl);// for top level control -procedure GetWidgetRelativePosition(aWidget: PGtkWidget; var Left, Top: integer); +procedure GetWidgetRelativePosition(aWidget: PGtkWidget; out Left, Top: integer); procedure UnsetResizeRequest(Widget: PGtkWidget); procedure SetResizeRequest(Widget: PGtkWidget); function WidgetSizeIsEditable(Widget: PGtkWidget): boolean; diff --git a/lcl/interfaces/gtk2/gtk2widgetset.inc b/lcl/interfaces/gtk2/gtk2widgetset.inc index b672b55632..32209f7672 100644 --- a/lcl/interfaces/gtk2/gtk2widgetset.inc +++ b/lcl/interfaces/gtk2/gtk2widgetset.inc @@ -4391,12 +4391,10 @@ var ActualFormatReturn: LongInt; NItemsReturn, BytesAfterReturn: Cardinal; Ptr: PByte; - screen: PGdkScreen; Valid: Boolean; begin Result := 0; - screen:=gdk_screen_get_default; Display := gdk_x11_get_default_xdisplay; if Display = nil then Exit; diff --git a/lcl/interfaces/gtk2/gtk2winapi.inc b/lcl/interfaces/gtk2/gtk2winapi.inc index 7942b5ac89..b153c35a53 100644 --- a/lcl/interfaces/gtk2/gtk2winapi.inc +++ b/lcl/interfaces/gtk2/gtk2winapi.inc @@ -289,8 +289,6 @@ end; ------------------------------------------------------------------------------} function TGtk2WidgetSet.ClipboardGetData(ClipboardType: TClipboardType; FormatID: TClipboardFormat; Stream: TStream): boolean; -type - PGdkAtom = ^TGdkAtom; var FormatAtom, FormatTry: TGdkAtom; SupportedCnt, i: integer; @@ -455,8 +453,6 @@ end; ------------------------------------------------------------------------------} function TGtk2WidgetSet.ClipboardGetFormats(ClipboardType: TClipboardType; var Count: integer; var List: PClipboardFormat): boolean; -type - PGdkAtom = ^TGdkAtom; var AllID: TGdkAtom; FormatAtoms: PGdkAtom; @@ -2452,7 +2448,6 @@ function TGtk2WidgetSet.DrawText(DC: HDC; Str: PChar; Count: Integer; const TabString = ' '; var - DevCtx: TGtkDeviceContext absolute DC; pIndex: Longint; AStr: String; @@ -2926,8 +2921,6 @@ end; function TGtk2WidgetSet.EnumFontFamilies(DC: HDC; Family: Pchar; EnumFontFamProc: FontEnumProc; LParam:Lparam):longint; var - DevCtx: TGtkDeviceContext absolute DC; - xFonts: PPChar; FontList: TStringList; EnumLogFont: TEnumLogFont; @@ -2999,10 +2992,6 @@ end; function TGtk2WidgetSet.EnumFontFamiliesEx(DC: HDC; lpLogFont: PLogFont; Callback: FontEnumExProc; Lparam:LParam; Flags: dword): longint; - -var - DevCtx: TGtkDeviceContext absolute DC; - type TXLFD=record Foundry: string[15]; @@ -5662,8 +5651,6 @@ end; Gets the Font Color currently assigned to the Device Context ------------------------------------------------------------------------------} function TGtk2WidgetSet.GetTextColor(DC: HDC) : TColorRef; -var - DevCtx: TGtkDeviceContext absolute DC; begin Result := 0; if IsValidDC(DC) then @@ -5949,9 +5936,6 @@ function TGtk2WidgetSet.GradientFill(DC: HDC; Vertices: PTriVertex; NumVertices : Longint; Meshes: Pointer; NumMeshes : Longint; Mode : Longint ): Boolean; -var - DevCtx: TGtkDeviceContext absolute DC; - function DoFillTriangle : Boolean; begin Result := (Mode and GRADIENT_FILL_TRIANGLE) = GRADIENT_FILL_TRIANGLE; @@ -6567,7 +6551,6 @@ end; ------------------------------------------------------------------------------} function TGtk2WidgetSet.MoveWindowOrgEx(DC: HDC; dX, dY: Integer): Boolean; var - DevCtx: TGtkDeviceContext absolute DC; NewOrigin: TPoint; begin Result:=IsValidDC(DC); @@ -6990,8 +6973,6 @@ end; ------------------------------------------------------------------------------} function TGtk2WidgetSet.RealizePalette(DC: HDC): Cardinal; -var - DevCtx: TGtkDeviceContext absolute DC; begin Result := 0; if IsValidDC(DC) @@ -7177,8 +7158,6 @@ end; function TGtk2WidgetSet.ReleaseDC(hWnd: HWND; DC: HDC): Integer; var - DevCtx: TGtkDeviceContext absolute DC; - aDC, pSavedDC: TGtkDeviceContext; g: TGDIType; CurGDIObject: PGDIObject; @@ -7654,8 +7633,6 @@ end; ------------------------------------------------------------------------------} function TGtk2WidgetSet.SelectPalette(DC: HDC; Palette: HPALETTE; ForceBackground: Boolean): HPALETTE; -var - DevCtx: TGtkDeviceContext absolute DC; begin //TODO: Implement this; Result := 0; @@ -8653,8 +8630,6 @@ end; ------------------------------------------------------------------------------} function TGtk2WidgetSet.SetTextCharacterExtra(DC : hdc; nCharExtra : Integer):Integer; -var - DevCtx: TGtkDeviceContext absolute DC; begin // Your code here Result:=0; @@ -8670,8 +8645,6 @@ end; context to the specified color. ------------------------------------------------------------------------------} function TGtk2WidgetSet.SetTextColor(DC: HDC; Color: TColorRef): TColorRef; -var - DevCtx: TGtkDeviceContext absolute DC; begin Result := CLR_INVALID; if IsValidDC(DC) @@ -8818,7 +8791,6 @@ end; function TGtk2WidgetSet.SetWindowOrgEx(DC : HDC; NewX, NewY : Integer; OldPoint: PPoint) : Boolean; var - DevCtx: TGtkDeviceContext absolute DC; OldP: TPoint; begin //DebugLn('[TGtk2WidgetSet.SetWindowOrgEx] ',NewX,' ',NewY); @@ -9123,7 +9095,6 @@ end; function TGtk2WidgetSet.ShowWindow(hWnd: HWND; nCmdShow: Integer): Boolean; var GtkWindow: PGtkWindow; - GdkWindow: PGdkWindow; B: Boolean; Widget: PGtkWidget; begin diff --git a/lcl/interfaces/gtk2/gtk2wsarrow.pp b/lcl/interfaces/gtk2/gtk2wsarrow.pp index a3f8c67edb..cf783fc268 100644 --- a/lcl/interfaces/gtk2/gtk2wsarrow.pp +++ b/lcl/interfaces/gtk2/gtk2wsarrow.pp @@ -35,7 +35,7 @@ uses //////////////////////////////////////////////////// // Arrow, //////////////////////////////////////////////////// - glib2, gdk2pixbuf, gdk2, gtk2, Pango, + gtk2, Classes, // LCL Controls, LCLType,