From b0deed02d2fd1914913119ac7d2eb1ff80f746b8 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sat, 17 Aug 2002 23:41:03 +0000
Subject: [PATCH] added exception handling for createpixmapindirect

git-svn-id: trunk@2158 -
---
 lcl/interfaces/gtk/gtkobject.inc | 44 ++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/lcl/interfaces/gtk/gtkobject.inc b/lcl/interfaces/gtk/gtkobject.inc
index e0c8c61e18..f4049f8ee4 100644
--- a/lcl/interfaces/gtk/gtkobject.inc
+++ b/lcl/interfaces/gtk/gtkobject.inc
@@ -6558,17 +6558,7 @@ end;
 function TgtkObject.CreateDefaultFont: PGdiObject;
 begin
   Result := NewGDIObject(gdiFont);
-  if FDefaultFont = nil then begin
-    FDefaultFont:=GetDefaultFont;
-    //  gdk_font_load('-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-iso8859-1');
-    if FDefaultFont = nil then begin
-      FDefaultFont:= gdk_font_load ('fixed');
-      if FDefaultFont = nil then
-        raise EOutOfResources.Create(rsUnableToLoadDefaultFont);
-    end;
-  end;    
-  Result^.GDIFontObject:= FDefaultFont;
-  gdk_font_ref(Result^.GDIFontObject);
+  Result^.GDIFontObject:= GetDefaultFont(true);
 end;
 
 {------------------------------------------------------------------------------
@@ -6615,7 +6605,7 @@ begin
     end else begin
       if (CurrentFont = nil) or (CurrentFont^.GDIFontObject = nil)
       then begin
-        UseFont := GetDefaultFont;
+        UseFont := GetDefaultFont(true);
         UnRef := True;
       end
       else begin
@@ -6623,7 +6613,7 @@ begin
         UnRef := False;
       end;
       If UseFont = nil then
-        WriteLn('WARNING: [TgtkObject.GetTGextMetrics] Missing font')
+        WriteLn('WARNING: [TgtkObject.GetTextMetrics] Missing font')
       else begin
         FillChar(DCTextMetric, SizeOf(DCTextMetric), 0);
         with DCTextMetric do begin
@@ -6650,15 +6640,34 @@ begin
                 gdk_char_width(UseFont, 'M')); // temp hack
           if TextMetric.tmMaxCharWidth<1 then
             TextMetric.tmMaxCharWidth:=1;
-          If UnRef then
-            GDK_Font_UnRef(UseFont);
         end;
+        If UnRef then
+          GDK_Font_UnRef(UseFont);
       end;
       Include(DCFlags,dcfTextMetricsValid);
     end;
   end;
 end;
 
+{------------------------------------------------------------------------------
+  function TgtkObject.GetDefaultFont(IncreaseReferenceCount: boolean): PGDKFont;
+ ------------------------------------------------------------------------------}
+function TgtkObject.GetDefaultFont(IncreaseReferenceCount: boolean): PGDKFont;
+begin
+  if FDefaultFont = nil then begin
+    FDefaultFont:=LoadDefaultFont;
+    //  gdk_font_load('-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-iso8859-1');
+    if FDefaultFont = nil then begin
+      FDefaultFont:= gdk_font_load ('fixed');
+      if FDefaultFont = nil then
+        raise EOutOfResources.Create(rsUnableToLoadDefaultFont);
+    end;
+  end;
+  Result:=FDefaultFont;
+  if IncreaseReferenceCount then
+    gdk_font_ref(Result);
+end;
+
 {------------------------------------------------------------------------------
   Function: SetRCFilename
   Params:  const AValue: string
@@ -7024,7 +7033,7 @@ var
     with TDeviceContext(DC) do begin
       if (CurrentFont = nil) or (CurrentFont^.GDIFontObject = nil)
       then begin
-        UseFont := GetDefaultFont;
+        UseFont := GetDefaultFont(true);
         UnRef := True;
       end
       else begin
@@ -7164,6 +7173,9 @@ end;
  { =============================================================================
 
   $Log$
+  Revision 1.347  2003/04/03 17:42:13  mattias
+  added exception handling for createpixmapindirect
+
   Revision 1.346  2003/04/02 13:23:24  mattias
   fixed default font