diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cf5e19b9e7..308886029e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-01 17:40 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/hbqtoolbar.prg + * contrib/hbide/ideactions.prg + * contrib/hbide/ideeditor.prg + * contrib/hbide/idethemes.prg + ! Changed: a little to pass correct parameters to methods + as per the changes in constructors. + + ; NOTE: now hbIDE neither throws any GPF on exit nor reports + "object destructure failure : reference to freed block" + 2012-06-01 17:14 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/qth/HBQSyntaxHighlighter.qth * contrib/hbqt/qtgui/qth/QAction.qth diff --git a/harbour/contrib/hbide/hbqtoolbar.prg b/harbour/contrib/hbide/hbqtoolbar.prg index 0198f719db..e60e98af4b 100644 --- a/harbour/contrib/hbide/hbqtoolbar.prg +++ b/harbour/contrib/hbide/hbqtoolbar.prg @@ -82,7 +82,7 @@ CLASS HbqToolbar DATA allowedAreas INIT Qt_TopToolBarArea DATA initialArea INIT Qt_TopToolBarArea DATA orientation INIT Qt_Horizontal - DATA size INIT QSize( 16,16 ) + DATA size DATA moveable INIT .f. DATA floatable INIT .f. @@ -132,6 +132,8 @@ METHOD HbqToolbar:create( cName, oParent ) DEFAULT ::cName TO "HbqToolbar_" + hb_ntos( ++nID ) + DEFAULT ::size TO QSize( 16,16 ) + ::oWidget := QToolbar() ::oWidget:setObjectName( ::cName ) ::oWidget:setAllowedAreas( ::allowedAreas ) diff --git a/harbour/contrib/hbide/ideactions.prg b/harbour/contrib/hbide/ideactions.prg index 9072a07db0..78f263fecc 100644 --- a/harbour/contrib/hbide/ideactions.prg +++ b/harbour/contrib/hbide/ideactions.prg @@ -514,12 +514,12 @@ METHOD IdeActions:buildMainMenu() oSubMenu:title := "~View" oMenuBar:addItem( { oSubMenu, NIL } ) - oSubMenu:addItem( { ::getAction( "TB_Hide" ), {|| oIde:execAction( "Hide" ) } } ) + oSubMenu:addItem( { ::getAction( "TB_Hide" ), {|| oIde:execAction( "Hide" ) } } ) ::oIde:qAnimateAction := QAction( oSubMenu:oWidget ) ::qAnimateAction:setText( "Toggle Animation" ) ::qAnimateAction:setCheckable( .t. ) - oSubMenu:addItem( { ::qAnimateAction, {|| oIde:execAction( "Animate" ) } } ) + oSubMenu:addItem( { ::qAnimateAction, {|| oIde:execAction( "Animate" ) } } ) hbide_menuAddSep( oSubMenu ) oSubMenu:oWidget:addAction( ::oIde:oMainToolbar:oWidget:toggleViewAction() ) diff --git a/harbour/contrib/hbide/ideeditor.prg b/harbour/contrib/hbide/ideeditor.prg index 8074744801..07fba10c2b 100644 --- a/harbour/contrib/hbide/ideeditor.prg +++ b/harbour/contrib/hbide/ideeditor.prg @@ -1355,7 +1355,7 @@ METHOD IdeEditor:create( oIde, cSourceFile, nPos, nHPos, nVPos, cTheme, cView, a ::buildTabPage( ::sourceFile ) - ::qLayout := QBoxLayout() + ::qLayout := QBoxLayout( Qt_Vertical ) ::qLayout:setContentsMargins( 0,0,0,0 ) // ::oTab:oWidget:setLayout( ::qLayout ) diff --git a/harbour/contrib/hbide/idethemes.prg b/harbour/contrib/hbide/idethemes.prg index 36276550a4..e1acf50485 100644 --- a/harbour/contrib/hbide/idethemes.prg +++ b/harbour/contrib/hbide/idethemes.prg @@ -466,7 +466,7 @@ METHOD IdeThemes:setSyntaxHilighting( qEdit, cTheme, lNew, lSetEditor ) ::setForeBackGround( qEdit, cTheme ) - qHiliter := HBQSyntaxHighlighter() + qHiliter := HBQSyntaxHighlighter( qEdit:document() ) FOR EACH a_ IN ::aPatterns IF !empty( aAttr := ::getThemeAttribute( a_[ 1 ], cTheme ) ) @@ -493,7 +493,6 @@ METHOD IdeThemes:setSyntaxHilighting( qEdit, cTheme, lNew, lSetEditor ) qEdit:hbSetHighLighter( qHiliter ) ENDIF - qHiliter:setDocument( qEdit:document() ) IF lSetEditor qHiliter:hbSetEditor( qEdit ) ENDIF