fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-06-28 11:56 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbxbp/xbpfiledialog.prg
    ! Fixed: a regression where QApplication():focusWidget() 
       was returned as a NIL instead of QWidget.
This commit is contained in:
Pritpal Bedi
2012-06-28 18:58:58 +00:00
parent 7859b9f4a3
commit dd2a2956df
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -16,6 +16,11 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-06-28 11:56 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbxbp/xbpfiledialog.prg
! Fixed: a regression where QApplication():focusWidget()
was returned as a NIL instead of QWidget.
2012-06-28 11:25 UTC+0200 Viktor Szakats (harbour syenar.net)
* doc/dirstruc.txt
* updated

10
harbour/contrib/hbxbp/xbpfiledialog.prg
View File

@@ -124,6 +124,7 @@ METHOD XbpFileDialog:create( oParent, oOwner, aPos )
#endif
::oWidget:setOption( QFileDialog_DontResolveSymlinks, .t. )
::oWidget:setAttribute( Qt_WA_DeleteOnClose, .f. )
::postCreate()
@@ -269,7 +270,10 @@ METHOD XbpFileDialog:open( cDefaultFile, lCenter, lAllowMultiple, lCreateNewFile
::connect()
nResult := ::oWidget:exec()
::disconnect()
qFocus:setFocus( 0 )
::oWidget:close()
IF hb_isObject( qFocus )
qFocus:setFocus( 0 )
ENDIF
RETURN IIF( nResult == QDialog_Accepted, ::extractFileNames( lAllowMultiple ), NIL )
@@ -320,7 +324,9 @@ METHOD XbpFileDialog:saveAs( cDefaultFile, lFileList, lCenter )
::connect()
nResult := ::oWidget:exec()
::disconnect()
qFocus:setFocus( 0 )
IF hb_isObject( qFocus )
qFocus:setFocus( 0 )
ENDIF
RETURN IIF( nResult == QDialog_Accepted, ::extractFileNames(), NIL )