Skip to content

Commit 96a0c97

Browse files
committed
Branch X11-clean: removed if defined xcb.(2)
1 parent 06e7d97 commit 96a0c97

File tree

1 file changed

+2
-24
lines changed

1 file changed

+2
-24
lines changed

lib/common/graphics/msex11gdi.pas

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{$ifdef FPC}{$mode objfpc}{$h+}{$goto on}{$endif}
1212
interface
1313
uses
14-
{$ifdef use_xcb}mxcb{$else}mxlib{$endif},mxft,
14+
mxlib,mxft,
1515
{$ifdef FPC}dynlibs,{$endif}
1616
msegraphics,mseguiglob,msestrings,msegraphutils,mseguiintf,msetypes,
1717
msectypes,msefontconfig,msetriaglob;
@@ -143,7 +143,6 @@ x11fontdataty = record
143143
XftDrawSrcPicture: function(draw: pXftDraw; color: pXftColor): tpicture; cdecl;
144144
{$endif}
145145

146-
{$ifndef use_xcb}
147146
var
148147
XRenderSetPictureClipRectangles: procedure(dpy:PDisplay; picture:TPicture;
149148
xOrigin:longint; yOrigin:longint; rects:PXRectangle; n:longint);
@@ -196,8 +195,6 @@ x11fontdataty = record
196195
XRenderChangePicture: procedure(dpy: pdisplay; picture: tpicture;
197196
valuemask: culong; attributes: PXRenderPictureAttributes); cdecl;
198197

199-
{$endif}
200-
201198
implementation
202199
uses
203200
msesys,msesonames,sysutils,msefcfontselect,msedynload,
@@ -400,17 +397,9 @@ procedure init(const adisp: pdisplay; const avisual: msepvisual;
400397
argbrenderpictformat:= xrenderfindstandardformat(appdisp,pictstandardargb32);
401398
end;
402399

403-
{$ifdef use_xcb}
404-
noxft := true;
405-
{$endif}
406400
if not noxft then begin
407-
{$ifndef use_xcb}
408401
fhasxft:= fhasxft and xftdefaulthasrender(appdisp) and (xftgetversion() >= 20000);
409-
{$else}
410-
fhasxft := true;
411-
{$endif}
412-
413-
if fhasxft then begin
402+
if fhasxft then begin
414403
fhasxft:= xftinit(nil);
415404
if fhasxft then begin
416405
fhasxft:= xftinitftlibrary();
@@ -3233,7 +3222,6 @@ function getxftlib: boolean;
32333222
result:= true;
32343223
end;
32353224

3236-
{$ifndef use_xcb}
32373225
function getxrenderlib: boolean;
32383226
const
32393227
funcs: array[0..14] of funcinfoty = (
@@ -3288,16 +3276,6 @@ function getxrenderlib: boolean;
32883276
end;
32893277
end;
32903278

3291-
{$else}
3292-
3293-
function getxrenderlib: boolean;
3294-
begin
3295-
createcolorpic:= @createcolorpic2;
3296-
result := true;
3297-
end;
3298-
3299-
{$endif}
3300-
33013279
const
33023280
gdifunctions: gdifunctionaty = (
33033281
{$ifdef FPC}@{$endif}gdi_creategc,

0 commit comments

Comments
 (0)