Skip to content

Commit 4d2332f

Browse files
devinsmithdevinsmith
committed
Sync Fox 1.7.78 changes
1 parent f0d32bb commit 4d2332f

867 files changed

Lines changed: 6406 additions & 5894 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎adie/Adie.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* T h e A d i e T e x t E d i t o r *
44
* *
55
*********************************************************************************
6-
* Copyright (C) 1998,2021 by Jeroen van der Zijp. All Rights Reserved. *
6+
* Copyright (C) 1998,2022 by Jeroen van der Zijp. All Rights Reserved. *
77
*********************************************************************************
88
* This program is free software: you can redistribute it and/or modify *
99
* it under the terms of the GNU General Public License as published by *
@@ -150,7 +150,7 @@ long Adie::onUpdSyntaxPaths(FXObject* sender,FXSelector,void*){
150150
long Adie::onSigHarvest(FXObject*,FXSelector,void*){
151151
fxmessage("Harvesting...\n");
152152
#ifndef WIN32
153-
while(waitpid(-1,NULL,WNOHANG)>0){ }
153+
while(waitpid(-1,nullptr,WNOHANG)>0){ }
154154
#endif
155155
return 1;
156156
}
@@ -176,7 +176,7 @@ static void printusage(){
176176
// Print verson info
177177
static void printversion(){
178178
fxmessage("A.d.i.e. - ADvanced Interactive Editor %d.%d.%d.\n",VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH);
179-
fxmessage("Copyright (C) 2000,2020 Jeroen van der Zijp. All Rights Reserved.\n\n");
179+
fxmessage("Copyright (C) 2000,2022 Jeroen van der Zijp. All Rights Reserved.\n\n");
180180
fxmessage("Please visit: http://www.fox-toolkit.org for further information.\n");
181181
fxmessage("\n");
182182
fxmessage("This program is free software: you can redistribute it and/or modify\n");
@@ -197,8 +197,8 @@ static void printversion(){
197197
// Start the application
198198
FXint Adie::start(int argc,char** argv){
199199
FXString file,lang,execpath,iconpath,syntaxfile;
200-
TextWindow *window=NULL;
201-
Syntax *syntax=NULL;
200+
TextWindow *window=nullptr;
201+
Syntax *syntax=nullptr;
202202
FXbool edit=true;
203203
FXint line=0;
204204
FXint col=0;
@@ -372,7 +372,7 @@ TextWindow *Adie::findUnused() const {
372372
return windowlist[w];
373373
}
374374
}
375-
return NULL;
375+
return nullptr;
376376
}
377377

378378

@@ -383,13 +383,13 @@ TextWindow* Adie::findWindow(const FXString& file) const {
383383
return windowlist[w];
384384
}
385385
}
386-
return NULL;
386+
return nullptr;
387387
}
388388

389389

390390
// Open file and jump to line, or just jump to line if already open
391391
TextWindow* Adie::openFileWindow(const FXString& file,FXint lineno,FXint column){
392-
TextWindow *window=NULL;
392+
TextWindow *window=nullptr;
393393

394394
FXTRACE((1,"Adie::openFileWindow(%s,%d,%d)\n",file.text(),lineno,column));
395395

@@ -436,7 +436,7 @@ Syntax* Adie::getSyntaxByName(const FXString& lang){
436436
}
437437
}
438438
}
439-
return NULL;
439+
return nullptr;
440440
}
441441

442442

@@ -448,7 +448,7 @@ Syntax* Adie::getSyntaxByRegistry(const FXString& file){
448448
FXString lang=reg().readStringEntry("SYNTAX",name);
449449
return getSyntaxByName(lang);
450450
}
451-
return NULL;
451+
return nullptr;
452452
}
453453

454454

@@ -463,7 +463,7 @@ Syntax* Adie::getSyntaxByPattern(const FXString& file){
463463
}
464464
}
465465
}
466-
return NULL;
466+
return nullptr;
467467
}
468468

469469

@@ -478,7 +478,7 @@ Syntax* Adie::getSyntaxByContents(const FXString& contents){
478478
}
479479
}
480480
}
481-
return NULL;
481+
return nullptr;
482482
}
483483

484484

‎adie/Adie.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* T h e A d i e T e x t E d i t o r *
44
* *
55
*********************************************************************************
6-
* Copyright (C) 1998,2021 by Jeroen van der Zijp. All Rights Reserved. *
6+
* Copyright (C) 1998,2022 by Jeroen van der Zijp. All Rights Reserved. *
77
*********************************************************************************
88
* This program is free software: you can redistribute it and/or modify *
99
* it under the terms of the GNU General Public License as published by *
@@ -31,13 +31,15 @@
3131
class HelpWindow;
3232
class Preferences;
3333
class TextWindow;
34+
class FindInFiles;
3435
struct ParseInfo;
3536

3637

3738
// Main Application class
3839
class Adie : public FXApp {
3940
FXDECLARE(Adie)
4041
friend class TextWindow;
42+
friend class FindInFiles;
4143
protected:
4244
TextWindowList windowlist; // Window list
4345
FXFileAssociations *associations; // File association table

‎adie/Adie.stx‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ language "Julia"
177177

178178
# Operators
179179
rule "Operator"
180-
pattern "(\[|\]|\+=|\+|-=|-|\*=|\*|/=|//=|//|/|\\|%=|%|\^=|\^|!=|!|&&|&=|&|\|\||\|=|\||~=|~|>>>=|>>>|>>=|>>|<<=|<<|==|=|\.^|<=|<|>=|>|::|:|\.\.|\.|\>|<\||\?)"
180+
pattern "(\[|\]|\+=|\+|-=|-|\*=|\*|/=|//=|//|/|\\|%=|%|\^=|\^|!=|!|&&|&=|&|\|\||\|=|\||~=|~|>>>=|>>>|>>=|>>|<<=|<<|==|=>|=|\.^|<=|<:|<|>=|>|::|:|\.\.|\.|\>|<\||\?|,)"
181181
style "red"
182182
end
183183

@@ -1166,11 +1166,21 @@ language "JavaScript"
11661166
closepattern "^>>>>>>>.*?\n"
11671167
end
11681168

1169-
# C style comment
1169+
# C style comment (but we can nest)
11701170
rule "CComment"
11711171
openpattern "/\*"
11721172
closepattern "\*/"
11731173
style "darkgreen"
1174+
rule "CComment"
1175+
openpattern "/\*"
1176+
closepattern "\*/"
1177+
style "darkgreen"
1178+
rule "CComment"
1179+
openpattern "/\*"
1180+
closepattern "\*/"
1181+
style "darkgreen"
1182+
end
1183+
end
11741184
end
11751185

11761186
# C++ style comment

‎adie/Commands.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* U n d o a b l e C o m m a n d s *
44
* *
55
*********************************************************************************
6-
* Copyright (C) 1998,2021 by Jeroen van der Zijp. All Rights Reserved. *
6+
* Copyright (C) 1998,2022 by Jeroen van der Zijp. All Rights Reserved. *
77
*********************************************************************************
88
* This program is free software: you can redistribute it and/or modify *
99
* it under the terms of the GNU General Public License as published by *
@@ -39,7 +39,7 @@
3939

4040
/*******************************************************************************/
4141

42-
FXIMPLEMENT_ABSTRACT(FXTextCommand,FXCommand,NULL,0)
42+
FXIMPLEMENT_ABSTRACT(FXTextCommand,FXCommand,nullptr,0)
4343

4444

4545
// Return size of record plus any data kept here
@@ -54,7 +54,7 @@ FXTextCommand::~FXTextCommand(){
5454
}
5555

5656

57-
FXIMPLEMENT_ABSTRACT(FXTextInsert,FXTextCommand,NULL,0)
57+
FXIMPLEMENT_ABSTRACT(FXTextInsert,FXTextCommand,nullptr,0)
5858

5959
// Insert command
6060
FXTextInsert::FXTextInsert(FXText* txt,FXint p,FXint ni,const FXchar* ins):FXTextCommand(txt,p,0,ni){
@@ -79,7 +79,7 @@ void FXTextInsert::redo(){
7979
}
8080

8181

82-
FXIMPLEMENT_ABSTRACT(FXTextDelete,FXTextCommand,NULL,0)
82+
FXIMPLEMENT_ABSTRACT(FXTextDelete,FXTextCommand,nullptr,0)
8383

8484
// Delete command
8585
FXTextDelete::FXTextDelete(FXText* txt,FXint p,FXint nd,const FXchar* del):FXTextCommand(txt,p,nd,0){
@@ -104,7 +104,7 @@ void FXTextDelete::redo(){
104104
}
105105

106106

107-
FXIMPLEMENT_ABSTRACT(FXTextReplace,FXTextCommand,NULL,0)
107+
FXIMPLEMENT_ABSTRACT(FXTextReplace,FXTextCommand,nullptr,0)
108108

109109
// Replace command
110110
FXTextReplace::FXTextReplace(FXText* txt,FXint p,FXint nd,FXint ni,const FXchar* del,const FXchar* ins):FXTextCommand(txt,p,nd,ni){

‎adie/Commands.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* U n d o a b l e C o m m a n d s *
44
* *
55
*********************************************************************************
6-
* Copyright (C) 1998,2021 by Jeroen van der Zijp. All Rights Reserved. *
6+
* Copyright (C) 1998,2022 by Jeroen van der Zijp. All Rights Reserved. *
77
*********************************************************************************
88
* This program is free software: you can redistribute it and/or modify *
99
* it under the terms of the GNU General Public License as published by *
@@ -33,7 +33,7 @@ class FXTextCommand : public FXCommand {
3333
FXint ndel; // Deleted characters
3434
FXint nins; // Inserted characters
3535
public:
36-
FXTextCommand(FXText* txt,FXint p,FXint nd,FXint ni):text(txt),buffer(NULL),pos(p),ndel(nd),nins(ni){}
36+
FXTextCommand(FXText* txt,FXint p,FXint nd,FXint ni):text(txt),buffer(nullptr),pos(p),ndel(nd),nins(ni){}
3737
virtual FXuint size() const;
3838
virtual ~FXTextCommand();
3939
};

0 commit comments

Comments
 (0)