2011-03-17 08:46 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* src/common/hbver.c
    + New Intel compiler version detection. [Tamas Tevesz]

  * src/rtl/tpopup.prg
    ! Fixing shadow extension. [Maurizio la Cecilia]
      (with my indenting, fix and deletion of commented lines)

  * contrib/hbqt/qtgui/hbqtgui.hbx
    * Updated.

  * contrib/hbqt/qtcore/hbqt_hbqevents.cpp
    ! Experimental fix [via Francesco Perillo]
This commit is contained in:
Viktor Szakats
2011-03-17 07:47:37 +00:00
parent db07694a28
commit f090632668
5 changed files with 50 additions and 8 deletions

View File

@@ -16,6 +16,20 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-03-17 08:46 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/common/hbver.c
+ New Intel compiler version detection. [Tamas Tevesz]
* src/rtl/tpopup.prg
! Fixing shadow extension. [Maurizio la Cecilia]
(with my indenting, fix and deletion of commented lines)
* contrib/hbqt/qtgui/hbqtgui.hbx
* Updated.
* contrib/hbqt/qtcore/hbqt_hbqevents.cpp
! Experimental fix [via Francesco Perillo]
2011-03-16 13:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/gtxwc/gtxwc.c
* contrib/hbct/disk.c

View File

@@ -218,7 +218,7 @@ bool HBQEvents::eventFilter( QObject * object, QEvent * event )
PHBQT_EVENT_FUNC pCallback = s_pEventAllocateCallback.at( eventId );
if( pCallback )
{
PHB_ITEM pEvent = hbqt_create_objectGC( ( * pCallback )( event, false ), s_lstCreateObj.at( eventId ) );
PHB_ITEM pEvent = hb_itemNew( hbqt_create_objectGC( ( * pCallback )( event, false ), s_lstCreateObj.at( eventId ) ) );
ret = hb_itemGetL( hb_vmEvalBlockV( ( PHB_ITEM ) listBlock.at( found - 1 ), 1, pEvent ) );

View File

@@ -63,6 +63,7 @@ DYNAMIC HB_QBUTTONGROUP
DYNAMIC HB_QCALENDARWIDGET
DYNAMIC HB_QCHECKBOX
DYNAMIC HB_QCLIPBOARD
DYNAMIC HB_QCLOSEEVENT
DYNAMIC HB_QCOLOR
DYNAMIC HB_QCOLORDIALOG
DYNAMIC HB_QCOMBOBOX
@@ -317,6 +318,7 @@ DYNAMIC QBUTTONGROUP
DYNAMIC QCALENDARWIDGET
DYNAMIC QCHECKBOX
DYNAMIC QCLIPBOARD
DYNAMIC QCLOSEEVENT
DYNAMIC QCOLOR
DYNAMIC QCOLORDIALOG
DYNAMIC QCOMBOBOX

View File

@@ -684,6 +684,18 @@ char * hb_verCompiler( void )
iVerMinor = 0;
iVerPatch = 0;
#elif defined( __INTEL_COMPILER )
pszName = "Intel(R) C";
#if defined( __cplusplus )
hb_strncpy( szSub, "++", sizeof( szSub ) - 1 );
#endif
iVerMajor = __INTEL_COMPILER / 100;
iVerMinor = ( __INTEL_COMPILER % 100 ) / 10;
iVerPatch = 0;
#elif defined( __ICL )
pszName = "Intel(R) C";

View File

@@ -72,7 +72,7 @@ CREATE CLASS POPUPMENU FUNCTION HBPopUpMenu
VAR cargo
#ifdef HB_EXTENSION
VAR shadowed INIT .F. AS LOGICAL /* NOTE: This method is a Harbour extension [vszakats] */
VAR shadowed INIT .F. AS LOGICAL /* NOTE: This property is a Harbour extension [vszakats] */
#endif
METHOD addItem( oItem )
@@ -224,7 +224,7 @@ METHOD display() CLASS POPUPMENU
#ifdef HB_EXTENSION
IF ::shadowed
hb_Shadow( nTop + 1, nLeft + 1, ::nBottom + 1, ::nRight + 1 )
hb_Shadow( nTop, nLeft, ::nBottom, ::nRight )
ENDIF
#endif
@@ -476,16 +476,30 @@ METHOD open() CLASS POPUPMENU
IF ( nRight := ::nRight ) < 0
nRight := nLeft + ::nWidth + 1
ENDIF
IF nRight < 0 .OR. nRight > MaxCol()
::nLeft := MaxCol() - ::nWidth - 1
::nRight := MaxCol()
::nTop++
::nBottom++
#ifdef HB_EXTENSION
IF nRight < 0 .OR. nRight > iif( ::shadowed, MaxCol() - 2, MaxCol() )
::nLeft := MaxCol() - ::nWidth - iif( ::shadowed, 3, 1 )
::nRight := iif( ::shadowed, MaxCol() - 2, MaxCol() )
nLeft := ::nLeft
nRight := ::nRight
nTop := ::nTop
nBottom := ::nBottom
ENDIF
IF ::shadowed
nBottom += 1
nRight += 2
ENDIF
#else
IF nRight < 0 .OR. nRight > MaxCol()
::nLeft := MaxCol() - ::nWidth - 1
::nRight := MaxCol()
nLeft := ::nLeft
nRight := ::nRight
nTop := ::nTop
nBottom := ::nBottom
ENDIF
#endif
::aSaveScr := { nTop, nLeft, nBottom, nRight, SaveScreen( nTop, nLeft, nBottom, nRight ) }