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

2012-07-05 01:00 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbide/idebrowse.prg
  * contrib/hbide/ideconsole.prg
  * contrib/hbide/idedocks.prg
    ! Fixed: some regressions plus releasing objects no longer 
       required during execution of HbIDE.

  * contrib/hbqt/gtqtc/gtqtc.cpp
    ! Fixed: a regression caused by latest changes i HbQt.
This commit is contained in:
Pritpal Bedi
2012-07-05 08:05:37 +00:00
parent 1f6cb86673
commit 3845fbb3f4
5 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -16,6 +16,16 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-07-05 01:00 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/idebrowse.prg
* contrib/hbide/ideconsole.prg
* contrib/hbide/idedocks.prg
! Fixed: some regressions plus releasing objects no longer
required during execution of HbIDE.
* contrib/hbqt/gtqtc/gtqtc.cpp
! Fixed: a regression caused by latest changes i HbQt.
2012-07-05 00:43 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+ contrib/hbqt/qtopengl
+ contrib/hbqt/qtopengl/doc

35
harbour/contrib/hbide/idebrowse.prg
View File

@@ -1437,12 +1437,15 @@ METHOD IdeBrowsePanel:destroyBrw( oBrw )
IF ( n := ascan( ::aBrowsers, {|e_| e_[ SUB_BROWSER ] == oBrw } ) ) > 0
oSub := ::aBrowsers[ n, SUB_WINDOW ]
hb_adel( ::aBrowsers, n, .t. )
::qWidget:removeSubWindow( oSub )
oBrw:destroy()
oSub := NIL
hb_adel( ::aBrowsers, n, .t. )
#if 1
oSub:setParent( QWidget() ) /* This alone releases all Windows down its hirarchy, right at this line */
/* Without it GPFing when a single browser was being closed via X button */
#endif
oBrw:destroy() /* this is almost non-effective */
oBrw := NIL
ENDIF
RETURN Self
@@ -1651,27 +1654,15 @@ METHOD IdeBrowse:new( oIde, oManager, oPanel, aInfo )
METHOD IdeBrowse:destroy()
IF ::lOpened
( ::cAlias )->( dbCloseArea() )
ENDIF
IF !empty( ::qTimer )
::qTimer:disconnect( "timeout()" )
::qTimer := NIL
ENDIF
IF ! empty( ::qMdi )
* ::qMdi:disconnect( "aboutToActivate()" )
::qMdi:disconnect( "windowStateChanged(Qt::WindowStates,Qt::WindowStates)" )
::qMdi:disconnect( QEvent_Close )
ENDIF
IF ! empty( ::oWnd )
::qLayout:removeWidget( ::qSplitter )
::oWnd:destroy()
::qForm := NIL
IF ::lOpened
( ::cAlias )->( dbCloseArea() )
ENDIF
::qSplitter := NIL
::oManager:oCurBrw := NIL
ENDIF
::QTimer := NIL
RETURN Self
@@ -1942,7 +1933,7 @@ METHOD IdeBrowse:buildMdiWindow()
* ::qMdi:connect( "aboutToActivate()", {|| ::execEvent( "mdiSubWindow_aboutToActivate" ) } )
::qMdi:connect( "windowStateChanged(Qt::WindowStates,Qt::WindowStates)", ;
{|p,p1| ::execEvent( "mdiSubWindow_windowStateChanged", p, p1 ) } )
::qMdi:connect( QEvent_Close, {|| ::execEvent( "mdiSubWindow_buttonXclicked" ) } )
::qMdi:connect( QEvent_Close, {|oEvent| oEvent:accept(), ::execEvent( "mdiSubWindow_buttonXclicked" ) } )
RETURN Self

14
harbour/contrib/hbide/ideconsole.prg
View File

@@ -217,7 +217,6 @@ METHOD IdeConsole:new( oIde )
::oIde := oIde
RETURN Self
/*----------------------------------------------------------------------*/
@@ -236,8 +235,13 @@ METHOD IdeConsole:show()
LOCAL qRect, qRect1
IF empty( ::oUI )
::oMdiArea := QMdiArea():new()
::oCuiEdDock:oWidget:setWidget( ::oMdiArea )
IF empty( ::oMdiArea )
::oMdiArea := QMdiArea()
::oMdiArea:setHorizontalScrollBarPolicy( Qt_ScrollBarAlwaysOn )
::oMdiArea:setVerticalScrollBarPolicy( Qt_ScrollBarAlwaysOn )
::oCuiEdDock:oWidget:setWidget( ::oMdiArea )
ENDIF
::oUI := XbpCrt():new( , , { 10,10 }, { 600,480 }, , .t. )
::oUI:title := "My First CRT"
@@ -267,10 +271,10 @@ METHOD IdeConsole:show()
BuildScreen()
::oMdiArea:removeSubWindow( ::oUI:oWidget /*::oMDI*/ )
::oMdiArea:removeSubWindow( ::oMDI )
::oMDI := NIL
::oUI:destroy()
::oUI:destroy()
::oUI := NIL
::oCuiEdDock:oWidget:hide()

1
harbour/contrib/hbide/idedocks.prg
View File

@@ -766,7 +766,6 @@ HB_TRACE( HB_TR_DEBUG, "editWidget_dragEnterEvent", 0 )
EXIT
CASE "editWidget_dropEvent"
HB_TRACE( HB_TR_DEBUG, "editWidget_dropEvent", 0 )
qMime := p:mimeData()
IF qMime:hasUrls()
qList := qMime:urls()

15
harbour/contrib/hbqt/gtqtc/gtqtc.cpp
View File

@@ -1127,14 +1127,19 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
break;
case HB_GTI_WIDGET:
//pInfo->pResult = hb_itemNew( hbqt_create_objectGC( hbqt_gcAllocate_QMainWindow( pWVT->qWnd, false ), "HB_QMAINWINDOW" ) );
pInfo->pResult = hbqt_bindSetHbObject( NULL, pWVT->qWnd, "HB_QMAINWINDOW", NULL, HBQT_BIT_QOBJECT );
{
PHB_ITEM pItem = hbqt_bindGetHbObject( NULL, pWVT->qWnd, "HB_QMAINWINDOW", NULL, HBQT_BIT_QOBJECT );
pInfo->pResult = hb_itemNew( pItem );
hb_itemRelease( pItem );
}
break;
case HB_GTI_DRAWINGAREA:
//pInfo->pResult = hb_itemNew( hbqt_create_objectGC( hbqt_gcAllocate_QWidget( pWVT->qWnd->_drawingArea, false ), "HB_QWIDGET" ) );
pInfo->pResult = hbqt_bindSetHbObject( NULL, pWVT->qWnd->_drawingArea, "HB_QWIDGET", NULL, HBQT_BIT_QOBJECT );
{
PHB_ITEM pItem = hbqt_bindGetHbObject( NULL, pWVT->qWnd->_drawingArea, "HB_QWIDGET", NULL, HBQT_BIT_QOBJECT );
pInfo->pResult = hb_itemNew( pItem );
hb_itemRelease( pItem );
}
break;
case HB_GTI_EVENTLOOP: