diff --git a/source/ide/ide_global.bas b/source/ide/ide_global.bas index aaf1ae6c0..a5c7165fa 100644 --- a/source/ide/ide_global.bas +++ b/source/ide/ide_global.bas @@ -124,13 +124,6 @@ listOfKeywords$ = listOfKeywords$ + "_GLPOPATTRIB@_GLPOPCLIENTATTRIB@_GLPOPMATRI listOfKeywords$ = listOfKeywords$ + "_SOFTWARE@_SQUAREPIXELS@_STRETCH@_ALLOWFULLSCREEN@_ALL@_ECHO@_INSTRREV@_TRIM$@_ACCEPTFILEDROP@_FINISHDROP@_TOTALDROPPEDFILES@_DROPPEDFILE@_DROPPEDFILE$@_SHR@_SHL@" 'IDE MODULE: shared data & definitions -DIM SHARED mousex AS INTEGER -DIM SHARED mousey AS INTEGER -DIM SHARED mousewheel AS INTEGER -DIM SHARED mousebutton1 AS INTEGER -DIM SHARED mousebutton2 AS INTEGER -DIM SHARED mousevisible AS INTEGER -DIM SHARED mousepassed AS INTEGER '--------------------------------------------------- DIM SHARED idesubwindow, idehelp DIM SHARED ideexit @@ -222,6 +215,3 @@ DIM SHARED idewx, idewy, idecustomfont, idecustomfontfile$, idecustomfontheight, DIM SHARED iderunmode 'IDE MODULE SECTION END: shared data & definitions -DIM SHARED IdeAndroidMenu -DIM SHARED IdeAndroidStartScript AS STRING -DIM SHARED IdeAndroidMakeScript AS STRING diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas index 2983006e8..2d4de5908 100644 --- a/source/ide/ide_methods.bas +++ b/source/ide/ide_methods.bas @@ -1040,7 +1040,7 @@ FUNCTION ide2 (ignore) END IF 'skipdisplay - STATIC prev_idecy AS LONG, idechangedbefore AS _BYTE + STATIC idechangedbefore AS _BYTE IF idechangemade THEN IF idelayoutallow THEN idelayoutallow = idelayoutallow - 1 @@ -5690,7 +5690,6 @@ FUNCTION idechange$ focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -5989,7 +5988,6 @@ SUB idechanged focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -6104,7 +6102,6 @@ FUNCTION idechangeit$ focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -6449,7 +6446,6 @@ SUB ideerrormessage (mess$) focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -6564,7 +6560,6 @@ FUNCTION idefileexists$ focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -6685,7 +6680,6 @@ FUNCTION idefind$ focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -7177,7 +7171,6 @@ SUB idenewsf (sf AS STRING) focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -7344,7 +7337,6 @@ SUB idenomatch focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -7459,7 +7451,6 @@ FUNCTION ideopen$ focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -7755,7 +7746,6 @@ FUNCTION iderestore$ focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -7867,7 +7857,6 @@ FUNCTION ideclearhistory$ (WhichHistory$) focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -7998,7 +7987,6 @@ FUNCTION idesaveas$ (programname$) focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -8197,7 +8185,6 @@ FUNCTION idesavenow$ focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -8942,7 +8929,6 @@ FUNCTION idesubs$ focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -9315,7 +9301,6 @@ FUNCTION idelanguagebox focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -10341,7 +10326,6 @@ FUNCTION idelayoutbox focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -10541,7 +10525,6 @@ FUNCTION idebackupbox focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -10708,7 +10691,6 @@ FUNCTION idemodifycommandbox focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -10844,7 +10826,6 @@ FUNCTION idegotobox focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -11003,7 +10984,6 @@ FUNCTION ideadvancedbox focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -11193,7 +11173,6 @@ SUB idemessagebox (titlestr$, messagestr$) focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -11328,7 +11307,6 @@ FUNCTION ideyesnobox$ (titlestr$, messagestr$) 'returns "Y" or "N" focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -11450,7 +11428,6 @@ FUNCTION idedisplaybox focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -11781,7 +11758,6 @@ FUNCTION idechoosecolorsbox focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -12513,7 +12489,6 @@ FUNCTION idecolorpicker$ (editing) focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -13198,7 +13173,6 @@ FUNCTION idesearchedbox$ focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -13418,7 +13392,6 @@ FUNCTION iderecentbox$ focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -13967,8 +13940,6 @@ SUB ideASCIIbox temp1 = _NEWIMAGE(640, 480, 32) ws = _NEWIMAGE(640, 480, 32) SCREEN temp - DIM CurrentASC(1 TO 16, 1 TO 16) - DIM CurrentOne AS INTEGER CLS , _RGB(0, 0, 170) COLOR , _RGB(0, 0, 170) FOR y = 1 TO 16 @@ -14104,7 +14075,6 @@ FUNCTION idef1box$ (lnks$, lnks) focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- @@ -14232,7 +14202,6 @@ SUB Mathbox focus = 1 DIM p AS idedbptype DIM o(1 TO 100) AS idedbotype - DIM oo AS idedbotype DIM sep AS STRING * 1 sep = CHR$(0) '-------- end of generic dialog box header -------- diff --git a/source/qb64.bas b/source/qb64.bas index 226e25713..df42d3050 100644 --- a/source/qb64.bas +++ b/source/qb64.bas @@ -8457,7 +8457,7 @@ DO IF n = 2 THEN IF firstelement$ = "GOSUB" THEN - xgosub ca$, n + xgosub ca$ IF Error_Happened THEN GOTO errmes 'note: layout implemented in xgosub GOTO finishedline @@ -22344,7 +22344,7 @@ SUB xfilewrite (ca$, n) layoutdone = 1: IF LEN(layout$) THEN layout$ = layout$ + sp + l$ ELSE layout$ = l$ END SUB -SUB xgosub (ca$, n&) +SUB xgosub (ca$) a2$ = getelement(ca$, 2) IF validlabel(a2$) = 0 THEN Give_Error "Invalid label": EXIT SUB