QB64/QB64-PE
QB64/QB64-PE
1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-07-02 03:50:36 +00:00
Code Issues Releases Wiki Activity

Remove SUBs sorting under OS X, until it gets fixed.

Browse source 
After the addition of sorting to SUBs dialog, it stopped working under OS X.
This commit is contained in:
FellippeHeitor 2016-01-14 15:30:55 -02:00
parent d684b6cf05
commit 55035849fd
1 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
source/ide/ide_methods.bas
View file

@ -7279,7 +7279,7 @@ InsideDECLARE = 0
FoundExternalSUBFUNC = 0 FoundExternalSUBFUNC = 0
l$ = ideprogname$ l$ = ideprogname$
IF l$ = "" THEN l$ = "Untitled" + tempfolderindexstr$ IF l$ = "" THEN l$ = "Untitled" + tempfolderindexstr$
lSorted$ = l$ IF INSTR(_OS$, "MAC") = 0 THEN lSorted$ = l$
TotalSUBs = 0 TotalSUBs = 0
FOR y = 1 TO iden FOR y = 1 TO iden
@ -7353,11 +7353,13 @@ FOR y = 1 TO iden
l$ = l$ + sep + chr$(195) + chr$(196) + n$ + " " + sf$ + args$ l$ = l$ + sep + chr$(195) + chr$(196) + n$ + " " + sf$ + args$
'Populate SortedSubsList() 'Populate SortedSubsList()
TotalSUBs = TotalSUBs + 1 IF INSTR(_OS$, "MAC") = 0 THEN
ListItemLength = LEN(n$ + " " + sf$ + args$) TotalSUBs = TotalSUBs + 1
REDIM _PRESERVE SortedSubsList(1 to TotalSUBs) as string * 998 ListItemLength = LEN(n$ + " " + sf$ + args$)
SortedSubsList(TotalSUBs) = n$ + " " + sf$ + args$ REDIM _PRESERVE SortedSubsList(1 to TotalSUBs) as string * 998
MID$(SortedSubsList(TotalSUBs), 992, 6) = MKL$(y) + MKI$(ListItemLength) SortedSubsList(TotalSUBs) = n$ + " " + sf$ + args$
MID$(SortedSubsList(TotalSUBs), 992, 6) = MKL$(y) + MKI$(ListItemLength)
END IF
END IF END IF
NEXT NEXT
@ -7366,24 +7368,28 @@ FOR x = LEN(l$) TO 1 STEP -1
IF a$ = chr$(195) THEN MID$(l$, x, 1) = chr$(192): EXIT FOR IF a$ = chr$(195) THEN MID$(l$, x, 1) = chr$(192): EXIT FOR
NEXT NEXT
if TotalSUBs > 1 then IF INSTR(_OS$, "MAC") = 0 THEN
DIM m as _MEM if TotalSUBs > 1 then
m = _MEM(SortedSubsList()) DIM m as _MEM
Sort m 'Steve's sorting routine m = _MEM(SortedSubsList())
FOR x = 1 to TotalSUBs Sort m 'Steve's sorting routine
ListItemLength = CVI(MID$(SortedSubsList(x), LEN(SortedSubsList(x)) - 2, 2)) FOR x = 1 to TotalSUBs
lySorted$ = lySorted$ + MID$(SortedSubsList(x), LEN(SortedSubsList(x)) - 6, 4) ListItemLength = CVI(MID$(SortedSubsList(x), LEN(SortedSubsList(x)) - 2, 2))
lSorted$ = lSorted$ + sep + chr$(195) + chr$(196) + left$(SortedSubsList(x), ListItemLength) lySorted$ = lySorted$ + MID$(SortedSubsList(x), LEN(SortedSubsList(x)) - 6, 4)
NEXT lSorted$ = lSorted$ + sep + chr$(195) + chr$(196) + left$(SortedSubsList(x), ListItemLength)
NEXT
FOR x = LEN(lSorted$) TO 1 STEP -1 FOR x = LEN(lSorted$) TO 1 STEP -1
a$ = MID$(lSorted$, x, 1) a$ = MID$(lSorted$, x, 1)
IF a$ = chr$(195) THEN MID$(lSorted$, x, 1) = chr$(192): EXIT FOR IF a$ = chr$(195) THEN MID$(lSorted$, x, 1) = chr$(192): EXIT FOR
NEXT NEXT
SortedSubsFlag = idesortsubs SortedSubsFlag = idesortsubs
else else
SortedSubsFlag = 0 'Override idesortsubs if the current program doesn't have more than 1 subprocedure SortedSubsFlag = 0 'Override idesortsubs if the current program doesn't have more than 1 subprocedure
end if end if
ELSE
SortedSubsFlag = 0
END IF
'72,19 '72,19
i = 0 i = 0