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

2012-06-01 17:40 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* 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"
This commit is contained in:
Pritpal Bedi
2012-06-02 00:47:17 +00:00
parent 7233d39e7e
commit 85a3988e33
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -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

4
harbour/contrib/hbide/hbqtoolbar.prg
View File

@@ -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 )

4
harbour/contrib/hbide/ideactions.prg
View File

@@ -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() )

2
harbour/contrib/hbide/ideeditor.prg
View File

@@ -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 )

3
harbour/contrib/hbide/idethemes.prg
View File

@@ -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