From b7714b9734d5bf6cb7d5a9df6a444fa3697032bc Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 13 Apr 2007 10:18:43 +0000
Subject: [PATCH] 2007-04-13 12:18 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)    * harbour/source/debug/debugger.prg      ! Fixed a few compile
 errors.      ! Reapplied (and extended) a former fix regarding        the
 proper handling of the filenames.

   * harbour/source/rtl/tbrowse.prg
     ; Cosmetic.
---
 harbour/ChangeLog                 |  9 +++++++
 harbour/source/debug/debugger.prg | 42 ++++++++++++++-----------------
 harbour/source/rtl/tbrowse.prg    |  2 +-
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 93ac508983..b84c685d6e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-04-13 12:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * harbour/source/debug/debugger.prg
+     ! Fixed a few compile errors.
+     ! Reapplied (and extended) a former fix regarding 
+       the proper handling of the filenames.
+
+   * harbour/source/rtl/tbrowse.prg
+     ; Cosmetic.
+
 2007-04-13 11:50 UTC+0200 Lorenzo Fiorini (lorenzo.fiorini/at/gmail.com)
   * harbour/common.mak
     ! updated for new files
diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg
index 0924fda9a7..187052f02e 100644
--- a/harbour/source/debug/debugger.prg
+++ b/harbour/source/debug/debugger.prg
@@ -64,7 +64,6 @@
 
 //#pragma -es0
 
-
 #pragma BEGINDUMP
 
 #include "hbapigt.h"
@@ -72,7 +71,6 @@
 
 #pragma ENDDUMP
 
-
 #include "hbclass.ch"
 #include "hbmemvar.ch"
 #include "box.ch"
@@ -1575,6 +1573,10 @@ METHOD InputBox( cMsg, uValue, bValid, lEditable ) CLASS TDebugger
    local lExit
    local oWndInput := TDbWindow():New( nTop, nLeft, nBottom, nRight, cMsg,;
                                        ::oPullDown:cClrPopup )
+#ifndef HB_NO_READDBG
+   local bMouseSave
+   local oGet
+#endif
 
    DEFAULT lEditable TO .t.
 
@@ -1964,6 +1966,7 @@ METHOD Open() CLASS TDebugger
    LOCAL cFileName
    LOCAL cRealName
    LOCAL aFiles := ::GetSourceFiles()
+   LOCAL cExt
 
    ASort( aFiles )
    ASize( aFiles, Len( aFiles ) + 1 )
@@ -1990,7 +1993,8 @@ METHOD Open() CLASS TDebugger
          cFileName := cRealName
       endif
       ::cPrgName := cFileName
-      ::lppo := RAT(".PPO", UPPER(cFileName)) > 0
+      hb_FNameSplit( cFileName, NIL, NIL, @cExt )
+      ::lppo := ( Lower( cExt ) == ".ppo" )
       ::oPulldown:GetItemByIdent( "PPO" ):Checked := ::lppo
       ::oBrwText := nil
       ::oBrwText := TBrwText():New( ::oWndCode:nTop + 1, ::oWndCode:nLeft + 1,;
@@ -2007,27 +2011,23 @@ return nil
 
 
 METHOD OpenPPO() CLASS TDebugger
-   LOCAL nPos
    LOCAL lSuccess:=.F.
+   LOCAL cDir, cName, cExt
 
    IF Empty( ::cPrgName )
       RETURN .F.
    ENDIF
 
-   nPos := RAT(".PPO", UPPER(::cPrgName))
-   IF( nPos == 0 )
-      nPos := RAT(".PRG", UPPER(::cPrgName))
-      IF( nPos > 0 )
-         ::cPrgName := LEFT(::cPrgName,nPos-1) + ".ppo"
-      ELSE
-         ::cPrgName += ".ppo"
-      ENDIF
-      lSuccess := FILE(::cPrgName)
-      ::lppo := lSuccess
-   ELSE
-      ::cPrgName := LEFT(::cPrgName,nPos-1) + ".prg"
+   hb_FNameSplit( ::cPrgName, @cDir, @cName, @cExt )
+
+   IF Lower( cExt ) == ".ppo"
+      ::cPrgName := hb_FNameMerge( cDir, cName, ".prg" )
       lSuccess := FILE( ::cPrgName )
       ::lppo := !lSuccess
+   ELSE
+      ::cPrgName := hb_FNameMerge( cDir, cName, ".ppo" )
+      lSuccess := FILE( ::cPrgName )
+      ::lppo := lSuccess
    ENDIF
 
    IF( lSuccess )
@@ -2597,7 +2597,7 @@ return nil
 
 
 METHOD ShowCodeLine( nProc ) CLASS TDebugger
-   LOCAL nPos
+   LOCAL cDir, cName
    LOCAL nLine, cPrgName
 
    // we only update the stack window and up a new browse
@@ -2619,12 +2619,8 @@ METHOD ShowCodeLine( nProc ) CLASS TDebugger
       ENDIF
 
       if( ::lppo )
-         nPos :=RAT(".PRG", UPPER(cPrgName) )
-         IF( nPos > 0 )
-            cPrgName := LEFT( cPrgName, nPos-1 ) + ".ppo"
-         ELSE
-            cPrgName += cPrgName +".ppo"
-         ENDIF
+         hb_FNameSplit( cPrgName, @cDir, @cName, NIL )
+         cPrgName := hb_FNameMerge( cDir, cName, ".ppo" )
       endif
 
       if ! empty( cPrgName )
diff --git a/harbour/source/rtl/tbrowse.prg b/harbour/source/rtl/tbrowse.prg
index 70eca6ba10..312b014bce 100644
--- a/harbour/source/rtl/tbrowse.prg
+++ b/harbour/source/rtl/tbrowse.prg
@@ -68,7 +68,7 @@
 
 /* NOTE: Don't use SAY in this module, use DispOut(), DispOutAt() instead,
          otherwise it will not be CA-Cl*pper compatible.
-         ADDITION: Same goes for DevPos(), always use SetPod() instead.
+         ADDITION: Same goes for DevPos(), always use SetPos() instead.
          [vszakats] */
 
 /* TODO: :firstScrCol() --> nScreenCol