From 24dedd84e76321a7f8d5f9e2ff58dd0d25523ac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Wed, 27 Nov 2013 13:06:03 +0100
Subject: [PATCH] 2013-11-27 13:06 UTC+0100 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * src/rtl/gtxwc/gtxwc.c     * minor modification
 for future usage

  * src/rtl/hbini.prg
    ! fixed RTE on 'include' directive
---
 ChangeLog.txt         | 7 +++++++
 src/rtl/gtxwc/gtxwc.c | 3 +++
 src/rtl/hbini.prg     | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 876cc55840..f3a017e46c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,13 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-11-27 13:06 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/rtl/gtxwc/gtxwc.c
+    * minor modification for future usage
+
+  * src/rtl/hbini.prg
+    ! fixed RTE on 'include' directive
+
 2013-11-25 23:23 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/common/strwild.c
     ! fixed hb_strMatchFile() (C) and hb_fileMatch() (PRG) to respect
diff --git a/src/rtl/gtxwc/gtxwc.c b/src/rtl/gtxwc/gtxwc.c
index 0a6ad6008f..eba1a264f3 100644
--- a/src/rtl/gtxwc/gtxwc.c
+++ b/src/rtl/gtxwc/gtxwc.c
@@ -4250,6 +4250,9 @@ static HB_BOOL hb_gt_xwc_SetFont( PXWND_DEF wnd, const char * fontFace,
    wnd->fontHeight = xfs->max_bounds.ascent + xfs->max_bounds.descent;
    /* wnd->fontWidth = xfs->max_bounds.rbearing - xfs->min_bounds.lbearing; */
    wnd->fontWidth = xfs->max_bounds.width;
+
+   if( wnd->xfs )
+      XFreeFont( wnd->dpy, wnd->xfs );
    wnd->xfs = xfs;
 
    return HB_TRUE;
diff --git a/src/rtl/hbini.prg b/src/rtl/hbini.prg
index 1631dcaaa2..076c3a8a7f 100644
--- a/src/rtl/hbini.prg
+++ b/src/rtl/hbini.prg
@@ -142,7 +142,7 @@ STATIC FUNCTION hb_IniFileLow( cFileSpec )
    NEXT
 
    IF hFile == F_ERROR
-      RETURN NIL
+      RETURN ""
    ENDIF
 
    /* we'll read the whole file, then we'll break it in lines. */