60f61d1988
Mark FOX17 option broken (Not related to clang 6 in particular, the FOX-1.7
API is ever changing due to being a development version. This project
appears to be dead, so I'm not sure it is worth fixing.)
recorder.cpp:104:9: error: no matching member function for call to 'prepend'
NewMessage();
^~~~~~~~~~~~
recorder.cpp:51:6: note: expanded from macro 'NewMessage'
list.prepend((FXObject*)mm);
~~~~~^~~~~~~
/usr/local/include/fox-1.7/FXObjectList.h:256:10: note: candidate function not viable: no known conversion from 'FX::FXObject *' to 'MacroMessage *' for 1st argument
FXbool prepend(TYPE* object){ return FXObjectList::prepend(object); }
^
/usr/local/include/fox-1.7/FXObjectList.h:265:10: note: candidate function not viable: no known conversion from 'FX::FXObject *' to 'const FXObjectListOf<MacroMessage>' for 1st argument
FXbool prepend(const FXObjectListOf<TYPE>& objects){ return FXObjectList::prepend(objects); }
^
/usr/local/include/fox-1.7/FXObjectList.h:259:10: note: candidate function not viable: requires 2 arguments, but 1 was provided
FXbool prepend(TYPE* object,FXival n){ return FXObjectList::prepend(object,n); }
^
/usr/local/include/fox-1.7/FXObjectList.h:262:10: note: candidate function not viable: requires 2 arguments, but 1 was provided
FXbool prepend(TYPE** objects,FXival n){ return FXObjectList::prepend(objects,n); }
^
Rename/remake patches
48 lines
1.5 KiB
C++
48 lines
1.5 KiB
C++
--- src/appwin_base.cpp.orig 2013-10-03 09:22:51 UTC
|
|
+++ src/appwin_base.cpp
|
|
@@ -25,6 +25,7 @@
|
|
#include "prefs.h"
|
|
#include "lang.h"
|
|
|
|
+#include "compat.h"
|
|
#include "scidoc.h"
|
|
#include "filer.h"
|
|
#include "toolmgr.h"
|
|
@@ -45,7 +46,6 @@
|
|
#include "cmd_utils.h"
|
|
#include "scidoc_util.h"
|
|
#include "foreachtab.h"
|
|
-#include "compat.h"
|
|
|
|
#include "intl.h"
|
|
#include "appwin_base.h"
|
|
@@ -405,7 +405,14 @@ long TopWindowBase::onTimer(FXObject*o, FXSelector sel
|
|
long TopWindowBase::onCloseWait(FXObject*o, FXSelector sel, void*p)
|
|
{
|
|
if (FXSELTYPE(sel)==SEL_CHORE) {
|
|
- getApp()->addTimeout(this,ID_CLOSEWAIT, ONE_SECOND/10, NULL);
|
|
+ static FXint CloseWaitChoreCount=10;
|
|
+ if (CloseWaitChoreCount>0) {
|
|
+ CloseWaitChoreCount--;
|
|
+ getApp()->addChore(this,ID_CLOSEWAIT, NULL);
|
|
+ } else {
|
|
+ CloseWaitChoreCount=10;
|
|
+ getApp()->addTimeout(this,ID_CLOSEWAIT, ONE_SECOND/10, NULL);
|
|
+ }
|
|
} else {
|
|
close();
|
|
}
|
|
@@ -1246,7 +1253,12 @@ void TopWindowBase::ParseCommands(FXString &commands)
|
|
FXString filename=sect.text();
|
|
if (rowcol.empty()) {
|
|
FXint beg,end;
|
|
- if (rx_rowcol.match(filename,&beg,&end)) {
|
|
+#ifdef FOX_1_7_50_OR_NEWER
|
|
+ if (rx_rowcol.search(filename,0,filename.length(),Normal,&beg,&end,1)>=0)
|
|
+#else
|
|
+ if (rx_rowcol.match(filename,&beg,&end))
|
|
+#endif
|
|
+ {
|
|
if (!FXStat::isFile(filename)) {
|
|
rowcol=filename.mid(beg,end-beg).text();
|
|
filename=filename.left(beg).text();
|