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

2011-05-06 11:00 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbqt/qtgui/qth/QPrinterInfo.qth
    ! Fixed: constructor.
  * contrib/hbxbp/xbpgeneric.prg
    ! Minor.
  * contrib/hbxbp/xbpwindow.prg
    ! Fixed: rather commented out the code where :handleEvent()
      was destroying the object. I will look into another way 
      how this can be achieved where :close callback is not 
      defined to destroy the object and only xbeP_Close is 
      sent via PostAppEvent(). Like: 
         oXbpDialog:close := {|mp1,mp2,obj| PostAppEvent( xbeP_Close, , , obj ) }
      instead of
         oXbpDialog:close := {|mp1,mp2,obj| PostAppEvent( xbeP_Close, , , obj ), obj:destroy() }
This commit is contained in:
Pritpal Bedi
2011-05-06 18:09:12 +00:00
parent 6e7d8f29e7
commit 06871d3ce6
4 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -16,6 +16,21 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-05-06 11:00 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qtgui/qth/QPrinterInfo.qth
! Fixed: constructor.
* contrib/hbxbp/xbpgeneric.prg
! Minor.
* contrib/hbxbp/xbpwindow.prg
! Fixed: rather commented out the code where :handleEvent()
was destroying the object. I will look into another way
how this can be achieved where :close callback is not
defined to destroy the object and only xbeP_Close is
sent via PostAppEvent(). Like:
oXbpDialog:close := {|mp1,mp2,obj| PostAppEvent( xbeP_Close, , , obj ) }
instead of
oXbpDialog:close := {|mp1,mp2,obj| PostAppEvent( xbeP_Close, , , obj ), obj:destroy() }
2011-05-06 16:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* ChangeLog
! typo in last entry

22
harbour/contrib/hbqt/qtgui/qth/QPrinterInfo.qth
View File

@@ -75,11 +75,23 @@ HB_FUNC( QT_QPRINTERINFO )
{
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QPrinterInfo( *hbqt_par_QPrinterInfo( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QPrinterInfo( *hbqt_par_QPrinter( 2 ) ) );
HBQT_GC_T * q = ( HBQT_GC_T * ) hbqt_par_ptr( 1 );
if( q )
{
if( q->type == HBQT_TYPE_QPrinterInfo )
{
__HB_RETPTRGC__( new QPrinterInfo( *hbqt_par_QPrinterInfo( 1 ) ) );
}
if( q->type == HBQT_TYPE_QPrinter )
{
__HB_RETPTRGC__( new QPrinterInfo( *hbqt_par_QPrinter( 1 ) ) );
}
}
else
{
__HB_RETPTRGC__( new QPrinterInfo() );
}
}
else
{

2
harbour/contrib/hbxbp/xbpgeneric.prg
View File

@@ -210,8 +210,6 @@ PROCEDURE SetAppEvent( nEvent, mp1, mp2, oXbp )
aadd( t_events, { nEvent, mp1, mp2, iif( empty( oXbp ), t_oAppWindow, oXbp ) } )
/* HB_TRACE( HB_TR_ALWAYS, len( t_events ) ) */
RETURN
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbxbp/xbpwindow.prg
View File

@@ -673,9 +673,11 @@ METHOD XbpWindow:handleEvent( nEvent, mp1, mp2 )
SWITCH ( nEvent )
CASE xbeP_Close
#if 0
IF ! empty( ::oWidget )
::destroy()
ENDIF
#endif
EXIT
CASE xbeP_Keyboard
::keyboard( mp1 )