diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8e80154bcd..3661b7ef92 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2010-10-06 16:33 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbxbp/xbpwindow.prg + ! An important regression fix. + Please always construct an object when :from() is used as: + HB_Q*Class():from( pPtr ) + instead of + Q*Class():from( pPtr ) + 2010-10-06 12:22 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/ideedit.prg ! Fixed: regression reported by Itamar. diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg index c998bd2f3c..98c7a929e1 100644 --- a/harbour/contrib/hbxbp/xbpwindow.prg +++ b/harbour/contrib/hbxbp/xbpwindow.prg @@ -531,13 +531,13 @@ METHOD XbpWindow:grabEvent( nEvent, pEvent ) SWITCH ( nEvent ) CASE QEvent_MouseMove // :motion() - oEvent := QMouseEvent():from( pEvent ) + oEvent := HB_QMouseEvent():from( pEvent ) SetAppEvent( xbeM_Motion, { oEvent:x(), oEvent:y() }, NIL, self ) lRet := .f. EXIT CASE QEvent_MouseButtonPress // :lbClick() :mbClick() :rbClick() // :lbDown() :mbDown() :rbDown() - oEvent := QMouseEvent():from( pEvent ) + oEvent := HB_QMouseEvent():from( pEvent ) DO CASE CASE oEvent:button() == Qt_LeftButton SetAppEvent( xbeM_LbDown, { oEvent:x(), oEvent:y() }, NIL, self ) @@ -549,7 +549,7 @@ METHOD XbpWindow:grabEvent( nEvent, pEvent ) lRet := .f. EXIT CASE QEvent_MouseButtonRelease // :mbUp() :rbUp() :lbUp() - oEvent := QMouseEvent():from( pEvent ) + oEvent := HB_QMouseEvent():from( pEvent ) DO CASE CASE oEvent:button() == Qt_LeftButton SetAppEvent( xbeM_LbUp, { oEvent:x(), oEvent:y() }, NIL, self ) @@ -561,7 +561,7 @@ METHOD XbpWindow:grabEvent( nEvent, pEvent ) lRet := .f. EXIT CASE QEvent_MouseButtonDblClick // :lbDblClick() :mbDblClick() :rbDblClick() - oEvent := QMouseEvent():from( pEvent ) + oEvent := HB_QMouseEvent():from( pEvent ) DO CASE CASE oEvent:button() == Qt_LeftButton SetAppEvent( xbeM_LbDblClick, { oEvent:x(), oEvent:y() }, NIL, self ) @@ -573,26 +573,26 @@ METHOD XbpWindow:grabEvent( nEvent, pEvent ) lRet := .f. EXIT CASE QEvent_ContextMenu // - oEvent := QContextMenuEvent():from( pEvent ) + oEvent := HB_QContextMenuEvent():from( pEvent ) //SetAppEvent( xbeM_Context, { oEvent:globalX(), oEvent:globalY() }, NIL, self ) ::hbContextMenu( { oEvent:globalX(), oEvent:globalY() } ) EXIT CASE QEvent_Enter // :enter() IF ( ::lTrack ) - oEvent := QMouseEvent():from( pEvent ) + oEvent := HB_QMouseEvent():from( pEvent ) SetAppEvent( xbeM_Enter, { oEvent:x(), oEvent:y() }, NIL, self ) ENDIF lRet := .f. EXIT CASE QEvent_Leave // :leave() IF ( ::lTrack ) - oEvent := QMouseEvent():from( pEvent ) + oEvent := HB_QMouseEvent():from( pEvent ) SetAppEvent( xbeM_Leave, { oEvent:x(), oEvent:y() }, NIL, self ) ENDIF lRet := .f. EXIT CASE QEvent_Wheel // :wheel() - oEvent := QWheelEvent():from( pEvent ) + oEvent := HB_QWheelEvent():from( pEvent ) SetAppEvent( xbeM_Wheel, { oEvent:x(), oEvent:y() }, { oEvent:buttons(), oEvent:delta() }, self ) lRet := .f. EXIT @@ -605,27 +605,27 @@ METHOD XbpWindow:grabEvent( nEvent, pEvent ) lRet := .f. EXIT CASE QEvent_Paint // :paint() - oEvent := QPaintEvent():from( pEvent ) + oEvent := HB_QPaintEvent():from( pEvent ) oObj_N := oEvent:rect() SetAppEvent( xbeP_Paint, { oObj_N:left(), oObj_N:top(), oObj_N:right(), oObj_N:bottom() }, NIL, Self ) lRet := .f. EXIT CASE QEvent_Move // :move() - oEvent := QMoveEvent():from( pEvent ) + oEvent := HB_QMoveEvent():from( pEvent ) oP0 := oEvent:oldPos() oP1 := oEvent:pos() SetAppEvent( xbeP_Move, { oP0:x(), oP0:y() }, { oP1:x(), oP1:y() }, Self ) lRet := .f. EXIT CASE QEvent_Resize // :resize() - oEvent := QResizeEvent():from( pEvent ) + oEvent := HB_QResizeEvent():from( pEvent ) oObj_O := oEvent:oldSize() oObj_N := oEvent:size() SetAppEvent( xbeP_Resize, { oObj_O:width(), oObj_O:height() }, { oObj_N:width(), oObj_N:height() }, Self ) lRet := .f. EXIT CASE QEvent_DragEnter // :dragEnter() - oEvent := QDragEnterEvent():from( pEvent ) + oEvent := HB_QDragEnterEvent():from( pEvent ) oObj_O := oEvent:pos() SetAppEvent( xbeP_DragEnter, { oEvent:mouseButtons(), { oObj_O:x(), oObj_O:y() } }, /* oDragObj */, Self ) EXIT @@ -633,12 +633,12 @@ METHOD XbpWindow:grabEvent( nEvent, pEvent ) SetAppEvent( xbeP_DragLeave, NIL, NIL, Self ) EXIT CASE QEvent_DragMove // :dragMotion() - oEvent := QDragEnterEvent():from( pEvent ) + oEvent := HB_QDragEnterEvent():from( pEvent ) oObj_O := oEvent:pos() SetAppEvent( xbeP_DragMotion, { oEvent:mouseButtons(), { oObj_O:x(), oObj_O:y() } }, NIL, Self ) EXIT CASE QEvent_Drop // :dragDrop() - oEvent := QDragEnterEvent():from( pEvent ) + oEvent := HB_QDragEnterEvent():from( pEvent ) oObj_O := oEvent:pos() SetAppEvent( xbeP_DragDrop, { oEvent:mouseButtons() , { oObj_O:x(), oObj_O:y() } }, /* oDragObj */, Self ) EXIT