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

2012-05-08 20:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbqt/qtgui/hbqt_errorsys.prg
    * Guarded: against possible recursive error handler calls
        with hbqt_isActiveApplication().
  * contrib/hbqt/qtgui/hbqt_init.cpp
    + Added: HB_FUNC( HBQT_ISACTIVEAPPLICATION ).  

  ; NOTE: there may be a better solution, I know, but...
This commit is contained in:
Pritpal Bedi
2012-05-09 05:10:26 +00:00
parent 846f136647
commit b7150ccccf
3 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -16,6 +16,15 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-05-08 20:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qtgui/hbqt_errorsys.prg
* Guarded: against possible recursive error handler calls
with hbqt_isActiveApplication().
* contrib/hbqt/qtgui/hbqt_init.cpp
+ Added: HB_FUNC( HBQT_ISACTIVEAPPLICATION ).
; NOTE: there may be a better solution, I know, but...
2012-05-08 16:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qtwebkit/qth/QWebFrame.qth
* contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth

28
harbour/contrib/hbqt/qtgui/hbqt_errorsys.prg
View File

@@ -206,19 +206,23 @@ STATIC FUNCTION ErrorMessage( oError )
STATIC FUNCTION hbqt_messageBox( cMsg, cInfo, cTitle, nIcon )
LOCAL oMB
DEFAULT cTitle TO "Information"
DEFAULT nIcon TO QMessageBox_Information
oMB := QMessageBox()
oMB:setText( cMsg )
IF !empty( cInfo )
oMB:setInformativeText( cInfo )
ENDIF
oMB:setIcon( nIcon )
oMB:setWindowTitle( cTitle )
oMB:exec()
IF hbqt_IsActiveApplication()
DEFAULT cTitle TO "Information"
DEFAULT nIcon TO QMessageBox_Information
oMB := QMessageBox()
oMB:setText( cMsg )
IF !empty( cInfo )
oMB:setInformativeText( cInfo )
ENDIF
oMB:setIcon( nIcon )
oMB:setWindowTitle( cTitle )
oMB:exec()
ENDIF
RETURN nil
/*----------------------------------------------------------------------*/

6
harbour/contrib/hbqt/qtgui/hbqt_init.cpp
View File

@@ -607,6 +607,7 @@ static void hbqt_registerCallbacks( void )
/*----------------------------------------------------------------------*/
static QApplication * s_app = NULL;
static bool isQuitting = false;
HB_FUNC_EXTERN( __HBQTCORE );
@@ -652,8 +653,13 @@ static void hbqt_lib_init( void * cargo )
static void hbqt_lib_exit( void * cargo )
{
HB_SYMBOL_UNUSED( cargo );
isQuitting = true;
}
HB_FUNC( HBQT_ISACTIVEAPPLICATION )
{
hb_retl( ! isQuitting );
}
HB_CALL_ON_STARTUP_BEGIN( _hbqtgui_init_ )
hb_vmAtInit( hbqt_lib_init, NULL );