From 7ea5f756b4f2ec4f580034b4914b9f200d34914d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 1 Nov 2008 16:55:11 +0000 Subject: [PATCH] 2008-11-01 17:52 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/rtl/gtwvt/gtwvt.h * source/rtl/gtwvt/gtwvt.c + Added support for HB_GTI_ICONRES, HB_GTI_ICONFILE before the window is created. ! Fixed resource leak when HB_GTI_ICONFILE was used. ! Fixed problem with HB_GTI_ICONRES when it was resetting the icon if a non-string/non-numeric parameter was passed passed, which included simply trying to read the value using hb_gtInfo( HB_GTI_ICONRES ). If this was an intented feature, pls speak up. ; Please review these changes. --- harbour/ChangeLog | 13 +++++++++++++ harbour/source/rtl/gtwvt/gtwvt.h | 3 +++ 2 files changed, 16 insertions(+) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b95af46437..948e8cfb80 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,19 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-01 17:52 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * source/rtl/gtwvt/gtwvt.h + * source/rtl/gtwvt/gtwvt.c + + Added support for HB_GTI_ICONRES, HB_GTI_ICONFILE + before the window is created. + ! Fixed resource leak when HB_GTI_ICONFILE was used. + ! Fixed problem with HB_GTI_ICONRES when it was resetting + the icon if a non-string/non-numeric parameter was passed + passed, which included simply trying to read the value + using hb_gtInfo( HB_GTI_ICONRES ). If this was an intented + feature, pls speak up. + ; Please review these changes. + 2008-11-01 15:47 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/rtl/hbi18n.c % Removed 'comment' field from language file header. Any text diff --git a/harbour/source/rtl/gtwvt/gtwvt.h b/harbour/source/rtl/gtwvt/gtwvt.h index 0170a4f0d5..3967dbefb5 100644 --- a/harbour/source/rtl/gtwvt/gtwvt.h +++ b/harbour/source/rtl/gtwvt/gtwvt.h @@ -156,6 +156,9 @@ typedef struct BYTE chrTransTbl[ 256 ]; #endif + HICON hIcon; /* Title Bar and Task List icon. Can be NULL. */ + BOOL bIconToFree; /* Do we need to free this icon when it's not NULL? */ + int CodePage; /* Code page to use for display characters */ BOOL Win9X; /* Flag to say if running on Win9X not NT/2000/XP */ BOOL AltF4Close; /* Can use Alt+F4 to close application */