From e169dc8c345cff572a20e961cd4b64d87f211bd4 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Mon, 11 Apr 2011 22:49:09 +0000 Subject: [PATCH] 2011-04-11 15:44 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp ! Minor. * contrib/hbxbp/xbpwindow.prg ! Fixed: :currentSize() was not returning the correct values in case of XbpDialog(). --- harbour/ChangeLog | 15 +++++++++++++++ .../hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp | 7 ++++--- harbour/contrib/hbxbp/xbpwindow.prg | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 97bd920d5c..2b4246b2e2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,21 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-11 15:44 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp + ! Minor. + + * contrib/hbxbp/xbpwindow.prg + ! Fixed: :currentSize() was not returning the correct values + in case of XbpDialog(). + +2011-04-11 13:13 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbxbp/xbpparthandler.prg + * contrib/hbxbp/xbpwindow.prg + + Implemented: Xbase++ compatible :moveWithOwner feature. + Any dialog with :moveWithOwner set to TRUE will move together + with its owner if user moves the window which owns them. + 2011-04-11 13:00 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/xbpdialog.prg * contrib/hbxbp/xbpparthandler.prg diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp index a7d3321288..53e547c7ab 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp +++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp @@ -91,7 +91,6 @@ QVariant hbqt_fetchData( PHB_ITEM block, int type, int role, int par1, int par2 vv = hb_itemGetStrUTF8( ret, &pText01, NULL ); hb_strfree( pText01 ); HB_TRACE( HB_TR_DEBUG, ( " fetchData[ s = %s ]", hb_itemGetCPtr( ret ) ) ); - hb_itemRelease( ret ); } else if( hb_itemType( ret ) & HB_IT_LOGICAL ) { @@ -130,9 +129,11 @@ QVariant hbqt_fetchData( PHB_ITEM block, int type, int role, int par1, int par2 vv = * ( ( QFont * ) ( p->ph ) ); } - if( ret ) - hb_itemRelease( ret ); + if( ret ) + { + hb_itemRelease( ret ); + } hb_vmRequestRestore(); } diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg index fa4cebe5a9..753fadc9ad 100644 --- a/harbour/contrib/hbxbp/xbpwindow.prg +++ b/harbour/contrib/hbxbp/xbpwindow.prg @@ -1274,7 +1274,7 @@ METHOD XbpWindow:currentPos() METHOD XbpWindow:currentSize() - RETURN { ::oWidget:width(), ::oWidget:height() } + RETURN { ::oWidget:frameGeometry():width(), ::oWidget:frameGeometry():height() } /*----------------------------------------------------------------------*/