From 9386b75d56ea40587f4f428e2c264ebdf5559938 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Thu, 19 May 2011 15:35:24 +0000 Subject: [PATCH] 2011-05-19 08:31 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/ideedit.prg * contrib/hbide/ideeditor.prg ! Fixed: regression in last commit. Now hbIDE opens ok. ; TOFIX: split window is broken. --- harbour/ChangeLog | 6 ++++++ harbour/contrib/hbide/ideedit.prg | 4 +++- harbour/contrib/hbide/ideeditor.prg | 7 +++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 302b564a25..6418f29c5f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2011-05-19 08:31 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/ideedit.prg + * contrib/hbide/ideeditor.prg + ! Fixed: regression in last commit. Now hbIDE opens ok. + ; TOFIX: split window is broken. + 2011-05-19 17:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/valtoexp.prg * formatted HB_CSTR() diff --git a/harbour/contrib/hbide/ideedit.prg b/harbour/contrib/hbide/ideedit.prg index 55bc93cc97..8c577f3850 100644 --- a/harbour/contrib/hbide/ideedit.prg +++ b/harbour/contrib/hbide/ideedit.prg @@ -730,7 +730,9 @@ METHOD IdeEdit:execKeyEvent( nMode, nEvent, p, p1 ) METHOD IdeEdit:highlightPage() - ::qEdit:hbHighlightPage() + IF hb_isObject( ::oEditor:qHiliter ) + ::qEdit:hbHighlightPage() + ENDIF RETURN Self diff --git a/harbour/contrib/hbide/ideeditor.prg b/harbour/contrib/hbide/ideeditor.prg index 7b0051a0b0..3aa3c38a5a 100644 --- a/harbour/contrib/hbide/ideeditor.prg +++ b/harbour/contrib/hbide/ideeditor.prg @@ -1567,6 +1567,11 @@ METHOD IdeEditor:setDocumentProperties() hbide_image( iif( ::lReadOnly, "tabreadonly", "tabunmodified" ) ) ) ::lLoaded := .T. + IF hb_isObject( ::qHiliter ) + ::qHiliter:hbSetInitialized( .t. ) + ::qEdit:hbHighlightPage() + ENDIF + IF ::cType $ "PRG,C,CPP,H,CH,HBS" ::qTimerSave := QTimer() ::qTimerSave:setInterval( max( 30000, ::oINI:nTmpBkpPrd * 1000 ) ) @@ -1576,8 +1581,6 @@ METHOD IdeEditor:setDocumentProperties() ::oUpDn:show() ENDIF - ::qHiliter:hbSetInitialized( .t. ) - ::qEdit:hbHighlightPage() ::nBlock := qCursor:blockNumber() ::nColumn := qCursor:columnNumber()