From 925c99dfed4e2a2e5a3cd473e392ef4716536a1a Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Tue, 11 Sep 2012 20:23:33 +0000 Subject: [PATCH] 2012-09-11 13:19 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/gtwvg/hbgtwvg.ch ! Fixed: wrong contant values for HB_GTS_SW_* constants. * contrib/hbqt/hbmk2_qt.hb + Added: code to set right C++ callable function when a dock widget was added to QMainWindow object. --- harbour/ChangeLog | 8 ++++++++ harbour/contrib/gtwvg/hbgtwvg.ch | 8 ++++---- harbour/contrib/hbqt/hbmk2_qt.hb | 7 +++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 786f4d72a4..81895efaeb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2012-09-11 13:19 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/gtwvg/hbgtwvg.ch + ! Fixed: wrong contant values for HB_GTS_SW_* constants. + + * contrib/hbqt/hbmk2_qt.hb + + Added: code to set right C++ callable function when a dock widget + was added to QMainWindow object. + 2012-09-11 22:04 UTC+0200 Viktor Szakats (harbour syenar.net) + doc/en/hbflock.txt + tests/tflock.prg diff --git a/harbour/contrib/gtwvg/hbgtwvg.ch b/harbour/contrib/gtwvg/hbgtwvg.ch index 9dbdcbf55f..5032816adc 100644 --- a/harbour/contrib/gtwvg/hbgtwvg.ch +++ b/harbour/contrib/gtwvg/hbgtwvg.ch @@ -138,11 +138,11 @@ #define HB_GTS_NIT_RESOURCEBYID 2 /* ShowWindow modes | HB_GTS_SHOWWINDOW */ +#define HB_GTS_SW_HIDE 0 #define HB_GTS_SW_NORMAL 1 -#define HB_GTS_SW_RESTORE 2 -#define HB_GTS_SW_HIDE 3 -#define HB_GTS_SW_MINIMIZED 4 -#define HB_GTS_SW_MAXIMIZED 5 +#define HB_GTS_SW_MINIMIZED 2 +#define HB_GTS_SW_MAXIMIZED 3 +#define HB_GTS_SW_RESTORE 9 #define HB_GTI_GUI 1001 diff --git a/harbour/contrib/hbqt/hbmk2_qt.hb b/harbour/contrib/hbqt/hbmk2_qt.hb index 21ac96b903..1acb985528 100644 --- a/harbour/contrib/hbqt/hbmk2_qt.hb +++ b/harbour/contrib/hbqt/hbmk2_qt.hb @@ -1117,6 +1117,13 @@ STATIC PROCEDURE hbqtui_replaceConstants( /* @ */ cString ) ENDIF cString := SubStr( cString, 1, n - 1 ) + substr( cString, n + len( "QString::fromUtf8(" ), n1 - ( n + len( "QString::fromUtf8(" ) ) ) + SubStr( cString, n1 + 1 ) + ELSEIF ( n := At( "static_cast(", cString ) ) > 0 + cString := SubStr( cString, 1, n-1 ) + SubStr( cString, n + Len( "static_cast(" ) ) + n := At( "),", cString ) + IF n > 0 + cString := SubStr( cString, 1, n-1 ) + SubStr( cString, n + 1 ) + ENDIF + ENDIF IF hbqtui_occurs( cString, "|" ) > 0