MG: fixed fonts in XLFD format and styles

git-svn-id: trunk@1304 -
This commit is contained in:
lazarus 2002-02-09 01:48:14 +00:00
parent 38a833cac4
commit 852a061e5f

View File

@ -349,8 +349,8 @@ var
Widget: PGTKWidget; Widget: PGTKWidget;
HasFocus: boolean; HasFocus: boolean;
ForeGroundGC: PGdkGC; ForeGroundGC: PGdkGC;
OldGdkFunction: TGdkFunction; //OldGdkFunction: TGdkFunction;
ForeGroundGCValues: TGdkGCValues; //ForeGroundGCValues: TGdkGCValues;
begin begin
if Client = nil then begin if Client = nil then begin
WriteLn('WARNING: [GTKAPIWidgetClient_DrawCaret] Got nil client'); WriteLn('WARNING: [GTKAPIWidgetClient_DrawCaret] Got nil client');
@ -419,8 +419,8 @@ begin
// set draw function to xor // set draw function to xor
ForeGroundGC:=PGTKStyle( ForeGroundGC:=PGTKStyle(
PGTKWidget(Client)^.theStyle)^.fg_gc[GC_STATE[Integer(Pixmap) <> 1]]; PGTKWidget(Client)^.theStyle)^.fg_gc[GC_STATE[Integer(Pixmap) <> 1]];
gdk_gc_get_values(ForeGroundGC,@ForeGroundGCValues); //gdk_gc_get_values(ForeGroundGC,@ForeGroundGCValues);
OldGdkFunction:=ForeGroundGCValues.thefunction; //OldGdkFunction:=ForeGroundGCValues.thefunction;
gdk_gc_set_function(ForeGroundGC,GDK_invert); gdk_gc_set_function(ForeGroundGC,GDK_invert);
// draw the caret // draw the caret
@ -433,7 +433,7 @@ begin
Width, Height Width, Height
); );
// restore draw function // restore draw function
gdk_gc_set_function(ForeGroundGC,OldGdkFunction); gdk_gc_set_function(ForeGroundGC,GDK_COPY);
end else end else
writeln('***: Draw Caret failed: Client=',HexStr(Cardinal(Client),8),' X=',X,' Y=',Y,' W=',Width,' H=',Height,' ',Pixmap<>nil,',',PGTKWidget(Client)^.Window<>nil,',',PGTKWidget(Client)^.theStyle<>nil); writeln('***: Draw Caret failed: Client=',HexStr(Cardinal(Client),8),' X=',X,' Y=',Y,' W=',Width,' H=',Height,' ',Pixmap<>nil,',',PGTKWidget(Client)^.Window<>nil,',',PGTKWidget(Client)^.theStyle<>nil);
IsDrawn := True; IsDrawn := True;
@ -730,6 +730,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.27 2002/06/05 12:34:00 lazarus
MG: fixed fonts in XLFD format and styles
Revision 1.26 2002/06/04 19:28:18 lazarus Revision 1.26 2002/06/04 19:28:18 lazarus
MG: cursor is now inverted and can be used with twilight color scheme MG: cursor is now inverted and can be used with twilight color scheme