svn commit: r461984 - in head/editors/fxite: . files
Jason E. Hale
jhale at FreeBSD.org
Fri Feb 16 08:12:21 UTC 2018
Author: jhale
Date: Fri Feb 16 08:12:16 2018
New Revision: 461984
URL: https://svnweb.freebsd.org/changeset/ports/461984
Log:
Fix build with clang 6 (C++11 requires a space between literal and identifier)
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
Added:
head/editors/fxite/files/patch-fxscintilla_ScintillaFOX.cxx
- copied, changed from r461983, head/editors/fxite/files/patch-fxscintilla__ScintillaFOX.cxx
head/editors/fxite/files/patch-jef_compat.h
- copied, changed from r461983, head/editors/fxite/files/patch-jef__compat.h
head/editors/fxite/files/patch-jef_interproc.cpp
- copied, changed from r461983, head/editors/fxite/files/patch-jef__interproc.cpp
head/editors/fxite/files/patch-jef_shady__tabs.h
- copied, changed from r461983, head/editors/fxite/files/patch-jef__shady_tabs.h
head/editors/fxite/files/patch-src_appmain.h
- copied, changed from r461983, head/editors/fxite/files/patch-src__appmain.h
head/editors/fxite/files/patch-src_appname.cpp (contents, props changed)
head/editors/fxite/files/patch-src_appwin.cpp
- copied unchanged from r461983, head/editors/fxite/files/patch-src__appwin.cpp
head/editors/fxite/files/patch-src_appwin__base.cpp
- copied, changed from r461983, head/editors/fxite/files/patch-src__appwin_base.cpp
head/editors/fxite/files/patch-src_appwin__base.h
- copied, changed from r461983, head/editors/fxite/files/patch-src__appwin_base.h
head/editors/fxite/files/patch-src_appwin__pub.h
- copied, changed from r461983, head/editors/fxite/files/patch-src__appwin_pub.h
head/editors/fxite/files/patch-src_doctabs.cpp
- copied, changed from r461983, head/editors/fxite/files/patch-src__doctabs.cpp
head/editors/fxite/files/patch-src_fxasq.cpp
- copied, changed from r461983, head/editors/fxite/files/patch-src__fxasq.cpp
head/editors/fxite/files/patch-src_fxasq.h
- copied unchanged from r461983, head/editors/fxite/files/patch-src__fxasq.h
head/editors/fxite/files/patch-src_fxasq__lua.c
- copied unchanged from r461983, head/editors/fxite/files/patch-src__fxasq_lua.c
head/editors/fxite/files/patch-src_help.cpp
- copied, changed from r461983, head/editors/fxite/files/patch-src__help.cpp
head/editors/fxite/files/patch-src_luacmds.cpp
- copied, changed from r461983, head/editors/fxite/files/patch-src__luacmds.cpp
head/editors/fxite/files/patch-src_luacmds.h
- copied unchanged from r461983, head/editors/fxite/files/patch-src__luacmds.h
head/editors/fxite/files/patch-src_luafuncs.cpp
- copied, changed from r461983, head/editors/fxite/files/patch-src__luafuncs.cpp
head/editors/fxite/files/patch-src_luafuncs.h
- copied unchanged from r461983, head/editors/fxite/files/patch-src__luafuncs.h
head/editors/fxite/files/patch-src_luafx.h
- copied unchanged from r461983, head/editors/fxite/files/patch-src__luafx.h
head/editors/fxite/files/patch-src_macro.cpp
- copied, changed from r461983, head/editors/fxite/files/patch-src__macro.cpp
head/editors/fxite/files/patch-src_macro.h
- copied unchanged from r461983, head/editors/fxite/files/patch-src__macro.h
head/editors/fxite/files/patch-src_menuspec.cpp
- copied, changed from r461983, head/editors/fxite/files/patch-src__menuspec.cpp
head/editors/fxite/files/patch-src_migration.cpp (contents, props changed)
head/editors/fxite/files/patch-src_outpane.cpp
- copied unchanged from r461983, head/editors/fxite/files/patch-src__outpane.cpp
head/editors/fxite/files/patch-src_prefdlg.cpp
- copied unchanged from r461983, head/editors/fxite/files/patch-src__prefdlg.cpp
head/editors/fxite/files/patch-src_prefdlg__sntx.cpp
- copied, changed from r461983, head/editors/fxite/files/patch-src__prefdlg_sntx.cpp
head/editors/fxite/files/patch-src_recorder.cpp
- copied, changed from r461983, head/editors/fxite/files/patch-src__recorder.cpp
head/editors/fxite/files/patch-src_scidoc.cpp
- copied, changed from r461983, head/editors/fxite/files/patch-src__scidoc.cpp
head/editors/fxite/files/patch-src_scisrch.cpp
- copied, changed from r461983, head/editors/fxite/files/patch-src__scisrch.cpp
head/editors/fxite/files/patch-src_tagread.cpp
- copied unchanged from r461983, head/editors/fxite/files/patch-src__tagread.cpp
head/editors/fxite/files/patch-src_tagread.h
- copied, changed from r461983, head/editors/fxite/files/patch-src__tagread.h
head/editors/fxite/files/patch-src_theme.cpp
- copied unchanged from r461983, head/editors/fxite/files/patch-src__theme.cpp
Deleted:
head/editors/fxite/files/patch-fxscintilla__ScintillaFOX.cxx
head/editors/fxite/files/patch-jef__compat.h
head/editors/fxite/files/patch-jef__interproc.cpp
head/editors/fxite/files/patch-jef__shady_tabs.h
head/editors/fxite/files/patch-src__appmain.h
head/editors/fxite/files/patch-src__appwin.cpp
head/editors/fxite/files/patch-src__appwin_base.cpp
head/editors/fxite/files/patch-src__appwin_base.h
head/editors/fxite/files/patch-src__appwin_pub.h
head/editors/fxite/files/patch-src__doctabs.cpp
head/editors/fxite/files/patch-src__fxasq.cpp
head/editors/fxite/files/patch-src__fxasq.h
head/editors/fxite/files/patch-src__fxasq_lua.c
head/editors/fxite/files/patch-src__help.cpp
head/editors/fxite/files/patch-src__luacmds.cpp
head/editors/fxite/files/patch-src__luacmds.h
head/editors/fxite/files/patch-src__luafuncs.cpp
head/editors/fxite/files/patch-src__luafuncs.h
head/editors/fxite/files/patch-src__luafx.h
head/editors/fxite/files/patch-src__macro.cpp
head/editors/fxite/files/patch-src__macro.h
head/editors/fxite/files/patch-src__menuspec.cpp
head/editors/fxite/files/patch-src__outpane.cpp
head/editors/fxite/files/patch-src__prefdlg.cpp
head/editors/fxite/files/patch-src__prefdlg_sntx.cpp
head/editors/fxite/files/patch-src__recorder.cpp
head/editors/fxite/files/patch-src__scidoc.cpp
head/editors/fxite/files/patch-src__scisrch.cpp
head/editors/fxite/files/patch-src__tagread.cpp
head/editors/fxite/files/patch-src__tagread.h
head/editors/fxite/files/patch-src__theme.cpp
Modified:
head/editors/fxite/Makefile
head/editors/fxite/files/patch-src_export.cpp
head/editors/fxite/files/patch-src_luafx.cpp
Modified: head/editors/fxite/Makefile
==============================================================================
--- head/editors/fxite/Makefile Fri Feb 16 05:37:11 2018 (r461983)
+++ head/editors/fxite/Makefile Fri Feb 16 08:12:16 2018 (r461984)
@@ -38,6 +38,7 @@ FOX16_CONFIGURE_ENV= FOX_CFLAGS="$$(fox-config --cflag
FOX_LIBS="$$(fox-config --libs)" \
RESWRAP="${LOCALBASE}/bin/reswrap"
FOX17_DESC= Fox 1.7 GUI toolkit support
+FOX17_BROKEN= Fails to build: recorder.cpp:104:9: error: no matching member function for call to 'prepend'
FOX17_LIB_DEPENDS= libFOX-1.7.so:x11-toolkits/fox17
FOX17_CONFIGURE_ENV= FOX_CFLAGS="$$(pkgconf fox17 --cflags)" \
FOX_LIBS="$$(pkgconf fox17 --libs) -lX11" \
Copied and modified: head/editors/fxite/files/patch-fxscintilla_ScintillaFOX.cxx (from r461983, head/editors/fxite/files/patch-fxscintilla__ScintillaFOX.cxx)
==============================================================================
--- head/editors/fxite/files/patch-fxscintilla__ScintillaFOX.cxx Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-fxscintilla_ScintillaFOX.cxx Fri Feb 16 08:12:16 2018 (r461984)
@@ -1,6 +1,6 @@
--- fxscintilla/ScintillaFOX.cxx.orig 2013-10-03 09:22:51 UTC
+++ fxscintilla/ScintillaFOX.cxx
-@@ -171,7 +171,7 @@ private:
+@@ -171,7 +171,7 @@ class ScintillaFOX : public ScintillaBase { (private)
// From ScintillaBase
virtual bool ModifyScrollBars(int nMax, int nPage);
virtual void ReconfigureScrollBars();
@@ -18,7 +18,7 @@
// Have to call FXScrollArea::getViewportXxxx instead of getViewportXxxx
// to prevent infinite loop
#ifdef FOX_1_6
-@@ -1256,7 +1256,7 @@ long FXScintilla::onDNDMotion(FXObject*
+@@ -1256,7 +1256,7 @@ long FXScintilla::onDNDMotion(FXObject* sender,FXSelec
FXDragAction action;
FXint pos;
// Scroll into view
Copied and modified: head/editors/fxite/files/patch-jef_compat.h (from r461983, head/editors/fxite/files/patch-jef__compat.h)
==============================================================================
--- head/editors/fxite/files/patch-jef__compat.h Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-jef_compat.h Fri Feb 16 08:12:16 2018 (r461984)
@@ -78,7 +78,7 @@
FXID GetNetActiveWindow();
void WaitForWindowFocus(FXTopWindow*w, FXuint msecs=1000);
-
++
+// #define SetPadLRTB(o,l,r,t,b) \
+// (o)->setPadLeft(l); \
+// (o)->setPadRight(r); \
@@ -86,4 +86,4 @@
+// (o)->setPadBottom(b);
+//
+// #define SetPad(o,p) SetPadLRTB(o,p,p,p,p)
-+
+
Copied and modified: head/editors/fxite/files/patch-jef_interproc.cpp (from r461983, head/editors/fxite/files/patch-jef__interproc.cpp)
==============================================================================
--- head/editors/fxite/files/patch-jef__interproc.cpp Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-jef_interproc.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -1,6 +1,6 @@
--- jef/interproc.cpp.orig 2013-10-03 09:22:51 UTC
+++ jef/interproc.cpp
-@@ -323,6 +323,18 @@ static int SocketFailure(const char*func
+@@ -323,7 +323,19 @@ static int SocketFailure(const char*func)
}
@@ -9,17 +9,18 @@
+# define FOX_1_7_50_OR_NEWER
+# endif
+#endif
-+
+
+#ifdef FOX_1_7_50_OR_NEWER
+# define LookupInHash(d,k) ((d)->at(k))
+#else
+# define LookupInHash(d,k) ((d)->find(k))
+#endif
+
-
++
long InterProc::onSocketRead(FXObject*o,FXSelector sel,void*p)
{
-@@ -344,7 +356,7 @@ long InterProc::onSocketRead(FXObject*o,
+ switch (FXSELID(sel)) {
+@@ -344,7 +356,7 @@ long InterProc::onSocketRead(FXObject*o,FXSelector sel
ssize_t len=0;
char buf[bufsize];
int read_fd=(FXival)p;
Copied and modified: head/editors/fxite/files/patch-jef_shady__tabs.h (from r461983, head/editors/fxite/files/patch-jef__shady_tabs.h)
==============================================================================
--- head/editors/fxite/files/patch-jef__shady_tabs.h Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-jef_shady__tabs.h Fri Feb 16 08:12:16 2018 (r461984)
@@ -1,6 +1,6 @@
--- jef/shady_tabs.h.orig 2013-10-03 09:22:51 UTC
+++ jef/shady_tabs.h
-@@ -28,7 +28,7 @@ protected:
+@@ -28,7 +28,7 @@ class ShadyTabs: public FXTabBook { (protected)
void UpdateTabs();
public:
long onCmdOpenItem ( FXObject* sender, FXSelector sel, void* p );
Copied and modified: head/editors/fxite/files/patch-src_appmain.h (from r461983, head/editors/fxite/files/patch-src__appmain.h)
==============================================================================
--- head/editors/fxite/files/patch-src__appmain.h Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_appmain.h Fri Feb 16 08:12:16 2018 (r461984)
@@ -1,6 +1,6 @@
--- src/appmain.h.orig 2013-10-03 09:22:51 UTC
+++ src/appmain.h
-@@ -49,7 +49,7 @@ public:
+@@ -49,7 +49,7 @@ class AppClass: public FXApp { (public)
long onIpcExec(FXObject*o,FXSelector sel,void*p);
AppClass(const FXString& name, const FXString& title);
void exit(FXint code);
Added: head/editors/fxite/files/patch-src_appname.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/fxite/files/patch-src_appname.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -0,0 +1,16 @@
+Fix build with clang 6
+
+appname.cpp:145:32: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
+ dlg=new FxAsqWin(_("About "EXE_NAME), btns, i++);
+
+--- src/appname.cpp.orig 2018-02-16 06:02:39 UTC
++++ src/appname.cpp
+@@ -142,7 +142,7 @@ void AppAbout::AboutBox()
+ FxAsqWin*dlg=NULL;
+ FXString msg;
+ int rv=-1;
+- dlg=new FxAsqWin(_("About "EXE_NAME), btns, i++);
++ dlg=new FxAsqWin(_("About " EXE_NAME), btns, i++);
+ msg.format(App_About, _("Version"), VERSION, "yetanothergeek at gmail.com",
+ _(" This program is free software, under the terms of the \n"),
+ _("Running"),
Copied: head/editors/fxite/files/patch-src_appwin.cpp (from r461983, head/editors/fxite/files/patch-src__appwin.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/fxite/files/patch-src_appwin.cpp Fri Feb 16 08:12:16 2018 (r461984, copy of r461983, head/editors/fxite/files/patch-src__appwin.cpp)
@@ -0,0 +1,18 @@
+--- src/appwin.cpp.orig 2013-10-03 09:22:51 UTC
++++ src/appwin.cpp
+@@ -20,6 +20,7 @@
+ #include <fx.h>
+ #include <fxkeys.h>
+
++#include "compat.h"
+ #include "scidoc.h"
+ #include "doctabs.h"
+ #include "search.h"
+@@ -36,7 +37,6 @@
+ #include "statusbar.h"
+ #include "scidoc_util.h"
+ #include "foreachtab.h"
+-#include "compat.h"
+
+ #include "intl.h"
+ #include "appwin.h"
Copied and modified: head/editors/fxite/files/patch-src_appwin__base.cpp (from r461983, head/editors/fxite/files/patch-src__appwin_base.cpp)
==============================================================================
--- head/editors/fxite/files/patch-src__appwin_base.cpp Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_appwin__base.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -16,7 +16,7 @@
#include "intl.h"
#include "appwin_base.h"
-@@ -405,7 +405,14 @@ long TopWindowBase::onTimer(FXObject*o,
+@@ -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) {
@@ -32,7 +32,7 @@
} else {
close();
}
-@@ -1246,7 +1253,12 @@ void TopWindowBase::ParseCommands(FXStri
+@@ -1246,7 +1253,12 @@ void TopWindowBase::ParseCommands(FXString &commands)
FXString filename=sect.text();
if (rowcol.empty()) {
FXint beg,end;
Copied and modified: head/editors/fxite/files/patch-src_appwin__base.h (from r461983, head/editors/fxite/files/patch-src__appwin_base.h)
==============================================================================
--- head/editors/fxite/files/patch-src__appwin_base.h Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_appwin__base.h Fri Feb 16 08:12:16 2018 (r461984)
@@ -1,6 +1,6 @@
--- src/appwin_base.h.orig 2013-10-03 09:22:51 UTC
+++ src/appwin_base.h
-@@ -114,7 +114,7 @@ public:
+@@ -114,7 +114,7 @@ class TopWindowBase: public MainWinWithClipBrd { (publ
virtual ~TopWindowBase();
static TopWindowBase* instance();
virtual void create();
Copied and modified: head/editors/fxite/files/patch-src_appwin__pub.h (from r461983, head/editors/fxite/files/patch-src__appwin_pub.h)
==============================================================================
--- head/editors/fxite/files/patch-src__appwin_pub.h Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_appwin__pub.h Fri Feb 16 08:12:16 2018 (r461984)
@@ -1,6 +1,6 @@
--- src/appwin_pub.h.orig 2013-10-03 09:22:51 UTC
+++ src/appwin_pub.h
-@@ -55,7 +55,7 @@ public:
+@@ -55,7 +55,7 @@ class TopWinPub: public FXObject { (public)
static void ParseCommands(FXString &commands);
static FXMainWindow* instantiate(FXApp*a);
static void create();
Copied and modified: head/editors/fxite/files/patch-src_doctabs.cpp (from r461983, head/editors/fxite/files/patch-src__doctabs.cpp)
==============================================================================
--- head/editors/fxite/files/patch-src__doctabs.cpp Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_doctabs.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -1,6 +1,6 @@
--- src/doctabs.cpp.orig 2013-10-03 09:22:51 UTC
+++ src/doctabs.cpp
-@@ -56,7 +56,7 @@ long DocTabs::onDnd(FXObject* sender,FXS
+@@ -56,7 +56,7 @@ long DocTabs::onDnd(FXObject* sender,FXSelector sel, v
switch (FXSELTYPE(sel)) {
case SEL_DND_ENTER: {
if (getApp()->getCursorWindow()==this) { return 0; }
@@ -9,7 +9,7 @@
if (offeredDNDType(FROM_DRAGNDROP,urilistType)) {
acceptDrop();
dnd_accept=true;
-@@ -504,7 +504,7 @@ long DocTab::onDnd(FXObject* sender,FXSe
+@@ -504,7 +504,7 @@ long DocTab::onDnd(FXObject* sender,FXSelector sel, vo
FXEvent* ev=(FXEvent*)p;
switch(FXSELTYPE(sel)) {
case SEL_DND_ENTER: {
Modified: head/editors/fxite/files/patch-src_export.cpp
==============================================================================
--- head/editors/fxite/files/patch-src_export.cpp Fri Feb 16 05:37:11 2018 (r461983)
+++ head/editors/fxite/files/patch-src_export.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -1,5 +1,14 @@
--- src/export.cpp.orig 2013-10-03 09:22:51 UTC
+++ src/export.cpp
+@@ -73,7 +73,7 @@ void SaveToHTML(SciDoc*sci, FILE *fp )
+ fprintf(fp, "<title>%s</title>\n", FXPath::name(sci->Filename()).text());
+ // Probably not used by robots, but making a little advertisement for those looking
+ // at the source code doesn't hurt...
+- fputs("<meta name=\"Generator\" content=\""APP_NAME" HTML export\" />\n", fp);
++ fputs("<meta name=\"Generator\" content=\"" APP_NAME " HTML export\" />\n", fp);
+ if ( sci->sendMessage(SCI_GETCODEPAGE,0,0) == SC_CP_UTF8) {
+ fputs("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n", fp);
+ }
@@ -464,7 +464,7 @@ void SaveToPDF(SciDoc*sci, FILE *fp)
}
// start to write PDF file here (PDF1.4Ref(p63))
Copied and modified: head/editors/fxite/files/patch-src_fxasq.cpp (from r461983, head/editors/fxite/files/patch-src__fxasq.cpp)
==============================================================================
--- head/editors/fxite/files/patch-src__fxasq.cpp Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_fxasq.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -20,7 +20,7 @@
FXWindow*obj=(FXWindow*)keylist.data(i);
if (k&&obj) {
if (IsGroup(obj)) {
-@@ -299,7 +299,7 @@ void FxAsqWin::Select(const char*key, co
+@@ -299,7 +299,7 @@ void FxAsqWin::Select(const char*key, const char*value
{
FXHorizontalFrame *frm = new FXHorizontalFrame(userbox,LAYOUT_FILL_X);
new FXLabel(frm,label,NULL);
@@ -29,7 +29,7 @@
if (list) {
list->reparent(frm);
void*p=list->getUserData();
-@@ -315,7 +315,7 @@ void FxAsqWin::Select(const char*key, co
+@@ -315,7 +315,7 @@ void FxAsqWin::Select(const char*key, const char*value
void FxAsqWin::Option(const char*key, const char*value, const char*label)
{
@@ -38,7 +38,7 @@
if (!IsList(list)) {
list=new FXListBox(userbox,NULL,0,LISTBOX_OPTS);
keylist.insert(key,list);
-@@ -327,7 +327,7 @@ void FxAsqWin::Option(const char*key, co
+@@ -327,7 +327,7 @@ void FxAsqWin::Option(const char*key, const char*value
void FxAsqWin::Group(const char*key, const char*value, const char*label)
{
@@ -47,7 +47,7 @@
if (grp) {
((FXWindow*)grp)->reparent(userbox);
grp->setText(label);
-@@ -341,7 +341,7 @@ void FxAsqWin::Group(const char*key, con
+@@ -341,7 +341,7 @@ void FxAsqWin::Group(const char*key, const char*value,
void FxAsqWin::Radio(const char*key, const char*value, const char*label)
{
@@ -56,7 +56,7 @@
if (!IsGroup(grp)) {
grp=new GroupBox(userbox,NULL);
keylist.insert(key,grp);
-@@ -505,7 +505,7 @@ void FxAsqWin::Font(const char*key, cons
+@@ -505,7 +505,7 @@ void FxAsqWin::Font(const char*key, const char*value,
FxAsqWin::~FxAsqWin()
{
void*p=NULL;
Copied: head/editors/fxite/files/patch-src_fxasq.h (from r461983, head/editors/fxite/files/patch-src__fxasq.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/fxite/files/patch-src_fxasq.h Fri Feb 16 08:12:16 2018 (r461984, copy of r461983, head/editors/fxite/files/patch-src__fxasq.h)
@@ -0,0 +1,29 @@
+--- src/fxasq.h.orig 2013-10-03 09:22:51 UTC
++++ src/fxasq.h
+@@ -17,8 +17,11 @@
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
++#ifndef FXASQ_H
++#define FXASQ_H
+
+ #include "fxasq_c.h"
++#include "compat.h"
+
+
+ class FxAsqWin: public FXObject {
+@@ -33,7 +36,7 @@ class FxAsqWin: public FXObject {
+ void AppendResult(const char*key, const char*value);
+ void PutResults();
+ protected:
+- FXDict keylist;
++ Dictionary keylist;
+ FXVerticalFrame *userbox;
+ public:
+
+@@ -55,4 +58,5 @@ class FxAsqWin: public FXObject {
+ void Color( const char*key, const char*value, const char*label);
+ void Font( const char*key, const char*value, const char*label);
+ };
++#endif
+
Copied: head/editors/fxite/files/patch-src_fxasq__lua.c (from r461983, head/editors/fxite/files/patch-src__fxasq_lua.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/fxite/files/patch-src_fxasq__lua.c Fri Feb 16 08:12:16 2018 (r461984, copy of r461983, head/editors/fxite/files/patch-src__fxasq_lua.c)
@@ -0,0 +1,50 @@
+--- src/fxasq_lua.c.orig 2013-10-03 09:22:51 UTC
++++ src/fxasq_lua.c
+@@ -31,6 +31,9 @@
+ #include "intl.h"
+ #include "fxasq_lua.h"
+
++#if LUA_VERSION_NUM<502
++# define lua_rawlen lua_objlen
++#endif
+
+ #define DLG_MODULE_NAME "dialog"
+ #define MetaName "_fxasq_metatable"
+@@ -234,7 +237,7 @@ static int asq_new(lua_State *L) {
+ if (argc>=2) {
+ luaL_argcheck(L,lua_istable(L,2),2,_("expected table"));
+ }
+- n=lua_objlen(L,2);
++ n=lua_rawlen(L,2);
+ for (i=1;i<=n; i++) {
+ lua_rawgeti(L,2,i);
+ char msg[64];
+@@ -301,7 +304,7 @@ static int asq_done(lua_State *L)
+
+
+
+-static const struct luaL_reg asq_funcs[] = {
++static const struct luaL_Reg asq_funcs[] = {
+ {"new", asq_new},
+ {"run", asq_run},
+ {"label", asq_label},
+@@ -330,12 +333,15 @@ int luaopen_dialog(lua_State *L)
+ lua_pushvalue(L, -2);
+ lua_settable(L, -3);
+
+- luaL_getmetatable(L, MetaName);
+ lua_pushstring(L,"__gc");
+ lua_pushcfunction(L,asq_done);
+ lua_rawset(L,-3);
+
+- luaL_register(L, NULL, &asq_funcs[1]);
+- luaL_register(L, DLG_MODULE_NAME, asq_funcs);
+- return 0;
++#if LUA_VERSION_NUM < 502
++ luaL_Register(L, NULL, &asq_funcs[1]);
++ luaL_Register(L, DLG_MODULE_NAME, asq_funcs);
++#else
++ luaL_setfuncs(L,asq_funcs,0);
++#endif
++ return 1;
+ }
Copied and modified: head/editors/fxite/files/patch-src_help.cpp (from r461983, head/editors/fxite/files/patch-src__help.cpp)
==============================================================================
--- head/editors/fxite/files/patch-src__help.cpp Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_help.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -1,6 +1,6 @@
--- src/help.cpp.orig 2013-10-03 09:22:51 UTC
+++ src/help.cpp
-@@ -36,6 +36,12 @@
+@@ -36,7 +36,13 @@
#define sendString(iMessage, wParam, lParam) sendMessage(iMessage, wParam, reinterpret_cast<long>(lParam))
@@ -9,11 +9,12 @@
+#else
+# define RxFind(rx,subj,start,beg,end,npar) (rx.match(subj,beg,end,REX_FORWARD,npar,start))
+#endif
-+
++
enum {
SCHLP_FIXED,
-@@ -224,7 +230,7 @@ void SciHelp::replace(const char*oldstr,
+ SCHLP_ITALIC,
+@@ -224,7 +230,7 @@ void SciHelp::replace(const char*oldstr, const char*ne
FXRex generic_rx(oldstr, REX_NORMAL|REX_NEWLINE);
content=(const char*)(sendMessage(SCI_GETCHARACTERPOINTER,0,0));
FXint n=strlen(newstr);
@@ -22,7 +23,7 @@
sendMessage(SCI_SETTARGETSTART,beg[0],0);
sendMessage(SCI_SETTARGETEND,end[0],0);
sendString(SCI_REPLACETARGET,n,newstr);
-@@ -261,7 +267,7 @@ void SciHelp::parse(const char*txt, unsi
+@@ -261,7 +267,7 @@ void SciHelp::parse(const char*txt, unsigned int size)
for (FXint i=SCHLP_FIRST; i<SCHLP_LAST; i++) {
content=(const char*)(sendMessage(SCI_GETCHARACTERPOINTER,0,0));
FXRex rx(phrases[i], REX_CAPTURE|REX_NEWLINE);
@@ -31,8 +32,12 @@
sendMessage(SCI_SETTARGETSTART,beg[0],0);
sendMessage(SCI_SETTARGETEND,end[0],0);
char*tmp=my_strndup(content+beg[1], end[1]-beg[1]);
-@@ -292,7 +298,7 @@ void SciHelp::parse(const char*txt, unsi
- FXRex appname_rx("\\<"APP_NAME"\\>", REX_NORMAL|REX_NEWLINE);
+@@ -289,10 +295,10 @@ void SciHelp::parse(const char*txt, unsigned int size)
+ }
+
+ // Make the editor's name stand out a little...
+- FXRex appname_rx("\\<"APP_NAME"\\>", REX_NORMAL|REX_NEWLINE);
++ FXRex appname_rx("\\<" APP_NAME "\\>", REX_NORMAL|REX_NEWLINE);
content=(const char*)(sendMessage(SCI_GETCHARACTERPOINTER,0,0));
FXint p=0;
- while (appname_rx.match(content,beg,end,REX_FORWARD,1, p)) {
Copied and modified: head/editors/fxite/files/patch-src_luacmds.cpp (from r461983, head/editors/fxite/files/patch-src__luacmds.cpp)
==============================================================================
--- head/editors/fxite/files/patch-src__luacmds.cpp Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_luacmds.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -1,6 +1,6 @@
--- src/luacmds.cpp.orig 2013-10-03 09:22:51 UTC
+++ src/luacmds.cpp
-@@ -530,7 +530,7 @@ static int view_clear_output(lua_State*
+@@ -530,7 +530,7 @@ static int view_clear_output(lua_State* L)
}
@@ -9,7 +9,7 @@
{"file_new", file_new},
{"file_open", file_open},
{"file_reload", file_reload},
-@@ -585,7 +585,7 @@ static const struct luaL_reg fxte_comman
+@@ -585,7 +585,7 @@ static const struct luaL_reg fxte_commands[] = {
Copied: head/editors/fxite/files/patch-src_luacmds.h (from r461983, head/editors/fxite/files/patch-src__luacmds.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/fxite/files/patch-src_luacmds.h Fri Feb 16 08:12:16 2018 (r461984, copy of r461983, head/editors/fxite/files/patch-src__luacmds.h)
@@ -0,0 +1,9 @@
+--- src/luacmds.h.orig 2013-10-03 09:22:51 UTC
++++ src/luacmds.h
+@@ -17,5 +17,5 @@
+ */
+
+
+-const luaL_reg* LuaCommands(FXMainWindow*topwin);
++const luaL_Reg* LuaCommands(FXMainWindow*topwin);
+
Copied and modified: head/editors/fxite/files/patch-src_luafuncs.cpp (from r461983, head/editors/fxite/files/patch-src__luafuncs.cpp)
==============================================================================
--- head/editors/fxite/files/patch-src__luafuncs.cpp Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_luafuncs.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -20,7 +20,7 @@
/*
-@@ -86,7 +89,7 @@ static bool check_find_flags(lua_State*
+@@ -86,7 +89,7 @@ static bool check_find_flags(lua_State* L, int pos, in
{
flags=0;
luaL_argcheck(L, lua_istable(L,pos), pos, _("expected table"));
@@ -47,7 +47,7 @@
{"seltext", seltext},
{"text", text},
{"documents", documents},
-@@ -1403,7 +1406,7 @@ static const struct luaL_reg fxte_funcs[
+@@ -1403,7 +1406,7 @@ static const struct luaL_reg fxte_funcs[] = {
Copied: head/editors/fxite/files/patch-src_luafuncs.h (from r461983, head/editors/fxite/files/patch-src__luafuncs.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/fxite/files/patch-src_luafuncs.h Fri Feb 16 08:12:16 2018 (r461984, copy of r461983, head/editors/fxite/files/patch-src__luafuncs.h)
@@ -0,0 +1,15 @@
+--- src/luafuncs.h.orig 2013-10-03 09:22:51 UTC
++++ src/luafuncs.h
+@@ -17,10 +17,10 @@
+ */
+
+
+-struct luaL_reg;
++struct luaL_Reg;
+ class TopWindow;
+
+-const luaL_reg* LuaFuncs();
++const luaL_Reg* LuaFuncs();
+ void LuaFuncsCleanup();
+ const char *LuaQuitMessage();
+
Modified: head/editors/fxite/files/patch-src_luafx.cpp
==============================================================================
--- head/editors/fxite/files/patch-src_luafx.cpp Fri Feb 16 05:37:11 2018 (r461983)
+++ head/editors/fxite/files/patch-src_luafx.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -38,7 +38,7 @@
{"message", message},
{"confirm", confirm},
{"input", input},
-@@ -620,7 +624,7 @@ static const struct luaL_reg fx_util_fun
+@@ -620,7 +624,7 @@ static const struct luaL_reg fx_util_funcs[] = {
Copied: head/editors/fxite/files/patch-src_luafx.h (from r461983, head/editors/fxite/files/patch-src__luafx.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/fxite/files/patch-src_luafx.h Fri Feb 16 08:12:16 2018 (r461984, copy of r461983, head/editors/fxite/files/patch-src__luafx.h)
@@ -0,0 +1,9 @@
+--- src/luafx.h.orig 2013-10-03 09:22:51 UTC
++++ src/luafx.h
+@@ -17,5 +17,5 @@
+ */
+
+
+-const luaL_reg* LuaFxUtils(FXWindow*topwin, const char*exe_name);
++const luaL_Reg* LuaFxUtils(FXWindow*topwin, const char*exe_name);
+
Copied and modified: head/editors/fxite/files/patch-src_macro.cpp (from r461983, head/editors/fxite/files/patch-src__macro.cpp)
==============================================================================
--- head/editors/fxite/files/patch-src__macro.cpp Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_macro.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -9,7 +9,7 @@
if (!lua_istable(L, -1)) {
lua_pop(L, 1);
return 1;
-@@ -324,7 +324,7 @@ static void debug_hook(lua_State *L, lua
+@@ -324,7 +324,7 @@ static void debug_hook(lua_State *L, lua_Debug *ar)
/* Override a builtin Lua function, or add a new one if it doesn't exist */
static void override(lua_State *L, const char*module, const char* funcname, lua_CFunction newfunc)
{
@@ -18,7 +18,7 @@
if (lua_istable(L,-1)) {
lua_pushstring(L,funcname);
if (newfunc) {
-@@ -342,7 +342,7 @@ static void override(lua_State *L, const
+@@ -342,7 +342,7 @@ static void override(lua_State *L, const char*module,
/* Don't let scripts try to read from stdin, as this would block indefinitely */
static void close_stdin(lua_State *L)
{
@@ -36,7 +36,7 @@
PersistRecord*pr=(PersistRecord*)keepers.data(i);
if (pr) {
if (pr->t==LUA_TSTRING) {
-@@ -406,11 +406,12 @@ void MacroRunner::PushKeepers(lua_State
+@@ -406,11 +406,12 @@ void MacroRunner::PushKeepers(lua_State *L)
lua_pushstring(L,PERSIST_TABLE_NAME);
lua_newtable(L);
lua_settable(L, -3);
@@ -51,7 +51,7 @@
switch (pr->t) {
case LUA_TNUMBER: { lua_pushnumber(L, pr->n); break;}
case LUA_TBOOLEAN:{ lua_pushboolean(L, pr->b); break;}
-@@ -455,7 +456,7 @@ void MacroRunner::PopKeepers(lua_State *
+@@ -455,7 +456,7 @@ void MacroRunner::PopKeepers(lua_State *L)
}
}
if (pr) {
@@ -60,7 +60,7 @@
}
}
lua_pop(L, 1);
-@@ -479,6 +480,9 @@ bool MacroRunner::RunMacro(const FXStrin
+@@ -479,6 +480,9 @@ bool MacroRunner::RunMacro(const FXString &source, boo
lua_State *L=luaL_newstate();
luaL_openlibs(L);
luaopen_dialog(L);
@@ -70,7 +70,7 @@
override(L,"os","exit", osexit);
override(L,"io","stdin", NULL);
override(L,"_G","print", print);
-@@ -487,11 +491,27 @@ bool MacroRunner::RunMacro(const FXStrin
+@@ -487,11 +491,27 @@ bool MacroRunner::RunMacro(const FXString &source, boo
si->script=isfilename?source.text():NULL;
states.append(si);
lua_sethook(L,debug_hook,LUA_MASKLINE,1);
Copied: head/editors/fxite/files/patch-src_macro.h (from r461983, head/editors/fxite/files/patch-src__macro.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/fxite/files/patch-src_macro.h Fri Feb 16 08:12:16 2018 (r461984, copy of r461983, head/editors/fxite/files/patch-src__macro.h)
@@ -0,0 +1,11 @@
+--- src/macro.h.orig 2013-10-03 09:22:51 UTC
++++ src/macro.h
+@@ -25,7 +25,7 @@ struct lua_State;
+
+ class MacroRunner: public FXObject {
+ private:
+- FXDict keepers; // <- Data stored between Lua states
++ Dictionary keepers; // <- Data stored between Lua states
+ void ClearKeepers();
+ void PushKeepers(lua_State *L);
+ void PopKeepers(lua_State *L);
Copied and modified: head/editors/fxite/files/patch-src_menuspec.cpp (from r461983, head/editors/fxite/files/patch-src__menuspec.cpp)
==============================================================================
--- head/editors/fxite/files/patch-src__menuspec.cpp Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_menuspec.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -1,6 +1,6 @@
--- src/menuspec.cpp.orig 2013-10-03 09:22:51 UTC
+++ src/menuspec.cpp
-@@ -616,7 +616,8 @@ void MenuMgr::ReadPopupMenu(FXRegistry*r
+@@ -616,7 +616,8 @@ void MenuMgr::ReadPopupMenu(FXRegistry*reg, const char
memset(keyname,0, sizeof(keyname));
snprintf(keyname,sizeof(keyname)-1,"Command_%d", i+1);
if (reg->existingEntry(popup_sect,keyname)) {
Added: head/editors/fxite/files/patch-src_migration.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/fxite/files/patch-src_migration.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -0,0 +1,29 @@
+Fix build with clang 6
+
+migration.cpp:134:27: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
+ "The location of the "APP_NAME" configuration directory has changed.\n"
+ ^
+
+migration.cpp:144:33: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
+ " Click [Cancel] to exit "APP_NAME" now without any changes.\n"
+
+--- src/migration.cpp.orig 2013-10-03 09:22:51 UTC
++++ src/migration.cpp
+@@ -131,7 +131,7 @@ void MigrateConfigDir(FXApp*a, const FXString &src, co
+ _("IMPORTANT NOTICE"),
+ _(
+ "\n"
+- "The location of the "APP_NAME" configuration directory has changed.\n"
++ "The location of the " APP_NAME " configuration directory has changed.\n"
+ "\n"
+ #ifndef WIN32
+ "This is due to changes in the FOX toolkit, in accordance with\n"
+@@ -141,7 +141,7 @@ void MigrateConfigDir(FXApp*a, const FXString &src, co
+ "Migration options:\n"
+ " Click [ Yes ] to automatically copy your old settings (recommended).\n"
+ " Click [ No ] to create a new configuration.\n"
+- " Click [Cancel] to exit "APP_NAME" now without any changes.\n"
++ " Click [Cancel] to exit " APP_NAME " now without any changes.\n"
+ "\n"
+ "Do you want me to copy your existing configuration?"
+ ),
Copied: head/editors/fxite/files/patch-src_outpane.cpp (from r461983, head/editors/fxite/files/patch-src__outpane.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/fxite/files/patch-src_outpane.cpp Fri Feb 16 08:12:16 2018 (r461984, copy of r461983, head/editors/fxite/files/patch-src__outpane.cpp)
@@ -0,0 +1,28 @@
+--- src/outpane.cpp.orig 2013-10-03 09:22:51 UTC
++++ src/outpane.cpp
+@@ -115,7 +115,12 @@ void OutputList::GoToError()
+ FXint begs[4]={0,0,0,0};
+ FXint ends[4]={0,0,0,0};
+ FXRex rx(pats[i].pat, REX_CAPTURE);
+- if (rx.match(txt,begs,ends,REX_FORWARD,3)) {
++#ifdef FOX_1_7_50_OR_NEWER
++ if (rx.search(txt,0,txt.length(),FXRex::Normal,begs,ends,3)>=0)
++#else
++ if (rx.match(txt,begs,ends,REX_FORWARD,3))
++#endif
++ {
+ FXString filename = txt.mid(begs[1],ends[1]-begs[1]);
+ FXString linenum = txt.mid(begs[2],ends[2]-begs[2]);
+ if (FXStat::isFile(filename)) {
+@@ -228,7 +233,11 @@ void OutputList::SelectFirstError()
+ FXRex rx(_(": [Ee]rror: "));
+ for (FXint i=0; i<getNumItems(); i++) {
+ FXListItem *item=getItem(i);
++#ifdef FOX_1_7_50_OR_NEWER
++ if (rx.search(item->getText(),0,item->getText().length())>=0) {
++#else
+ if (rx.match(item->getText())) {
++#endif
+ selectItem(i);
+ setCurrentItem(i);
+ makeItemVisible(i);
Copied: head/editors/fxite/files/patch-src_prefdlg.cpp (from r461983, head/editors/fxite/files/patch-src__prefdlg.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/fxite/files/patch-src_prefdlg.cpp Fri Feb 16 08:12:16 2018 (r461984, copy of r461983, head/editors/fxite/files/patch-src__prefdlg.cpp)
@@ -0,0 +1,113 @@
+--- src/prefdlg.cpp.orig 2013-10-03 09:22:51 UTC
++++ src/prefdlg.cpp
+@@ -415,13 +415,13 @@ void PrefsDialog::MakeGeneralTab()
+ right_column=new FXVerticalFrame(hframe,FRAME_SUNKEN|LAYOUT_FILL/*|PACK_UNIFORM_HEIGHT*/);
+
+ chk=new FXCheckButton(left_column, _("Watch files for external changes."), prefs, Settings::ID_TOGGLE_WATCH_EXTERN);
+- chk->setCheck(prefs->WatchExternChanges, FALSE);
++ chk->setCheck(prefs->WatchExternChanges, false);
+ chk->setPadBottom(8);
+
+ hframe=new FXHorizontalFrame(left_column);
+ SetPad(hframe,0);
+ chk=new FXCheckButton(hframe, _("Backup files every "), prefs, Settings::ID_TOGGLE_AUTOSAVE);
+- chk->setCheck(prefs->Autosave, FALSE);
++ chk->setCheck(prefs->Autosave, false);
+ chk->setPadBottom(12);
+ spin=new FXSpinner(hframe, 3, prefs, Settings::ID_SET_AUTOSAVE_INT,SPIN_OPTS);
+ spin->setRange(15,900);
+@@ -433,10 +433,10 @@ void PrefsDialog::MakeGeneralTab()
+
+ new FXLabel(left_column, _("Ask before closing multiple files:"));
+ chk=new FXCheckButton(left_column, _("From menu"), prefs, Settings::ID_TOGGLE_ASK_CLOSE_MULTI_MENU);
+- chk->setCheck(prefs->PromptCloseMultiMenu, FALSE);
++ chk->setCheck(prefs->PromptCloseMultiMenu, false);
+ chk->setPadLeft(12);
+ chk=new FXCheckButton(left_column, _("On exit"), prefs, Settings::ID_TOGGLE_ASK_CLOSE_MULTI_EXIT);
+- chk->setCheck(prefs->PromptCloseMultiExit, FALSE);
++ chk->setCheck(prefs->PromptCloseMultiExit, false);
+ chk->setPadLeft(12);
+ chk->setPadBottom(12);
+
+@@ -464,15 +464,15 @@ void PrefsDialog::MakeGeneralTab()
+
+ new FXLabel(right_column,_("Save open files before executing:"));
+ chk=new FXCheckButton(right_column, _("Tools->Filter Selection"), prefs, Settings::ID_SAVE_ON_FILTER_SEL);
+- chk->setCheck(prefs->SaveBeforeFilterSel, FALSE);
++ chk->setCheck(prefs->SaveBeforeFilterSel, false);
+ chk->setPadLeft(12);
+
+ chk=new FXCheckButton(right_column, _("Tools->Insert Command"), prefs, Settings::ID_SAVE_ON_INS_CMD);
+- chk->setCheck(prefs->SaveBeforeInsCmd, FALSE);
++ chk->setCheck(prefs->SaveBeforeInsCmd, false);
+ chk->setPadLeft(12);
+
+ chk=new FXCheckButton(right_column, _("Tools->Execute Command"), prefs, Settings::ID_SAVE_ON_EXEC_CMD);
+- chk->setCheck(prefs->SaveBeforeExecCmd, FALSE);
++ chk->setCheck(prefs->SaveBeforeExecCmd, false);
+ chk->setPadLeft(12);
+
+ #ifndef WIN32
+@@ -539,19 +539,19 @@ void PrefsDialog::MakeEditorTab()
+ list->setCurrentItem(prefs->AutoIndent);
+
+ chk=new FXCheckButton(column, _("Smart home key"), prefs, Settings::ID_TOGGLE_SMART_HOME);
+- chk->setCheck(prefs->SmartHome, FALSE);
++ chk->setCheck(prefs->SmartHome, false);
+
+ chk=new FXCheckButton(column, _("Smooth scrolling"), prefs, Settings::ID_TOGGLE_SMOOTH_SCROLL);
+- chk->setCheck(prefs->SmoothScroll, FALSE);
++ chk->setCheck(prefs->SmoothScroll, false);
+
+ chk=new FXCheckButton(column, _("Allow caret beyond end of line"), prefs, Settings::ID_TOGGLE_CARET_PAST_EOL);
+- chk->setCheck(prefs->CaretPastEOL, FALSE);
++ chk->setCheck(prefs->CaretPastEOL, false);
+
+ chk=new FXCheckButton(column,_("Turn line wrapping on by default"),prefs,Settings::ID_TOGGLE_WORD_WRAP);
+ chk->setCheck(prefs->WordWrap);
+
+ chk=new FXCheckButton(column, _("Wrap-aware home/end keys"), prefs, Settings::ID_TOGGLE_WRAP_AWARE);
+- chk->setCheck(prefs->WrapAwareHomeEnd, FALSE);
++ chk->setCheck(prefs->WrapAwareHomeEnd, false);
+
+ spinframe=new FXHorizontalFrame(column);
+ spin=new FXSpinner(spinframe, 2, prefs, Settings::ID_SET_CARET_WIDTH, SPIN_OPTS);
+@@ -605,14 +605,14 @@ void PrefsDialog::MakeEditorTab()
+ new FXLabel(spinframe, _("Indent width"));
+
+ chk->setUserData((void*)spin);
+- chk->setCheck(prefs->UseTabs, TRUE);
++ chk->setCheck(prefs->UseTabs, true);
+
+ new FXHorizontalSeparator(column,LAYOUT_SIDE_TOP|LAYOUT_FILL_X|SEPARATOR_GROOVE);
+ new FXLabel(column, _("Default search options:"));
+ srchopts=new SciSearchOptions(column, prefs,Settings::ID_SET_SEARCH_OPTS);
+ srchopts->SetSciFlags(prefs->SearchOptions);
+ chk=new FXCheckButton(column, _("Verbose search messages"), prefs, Settings::ID_TOGGLE_SEARCH_VERBOSE);
+- chk->setCheck(prefs->SearchVerbose, FALSE);
++ chk->setCheck(prefs->SearchVerbose, false);
+ chk->setPadLeft(6);
+
+ spinframe=new FXHorizontalFrame(column);
+@@ -635,10 +635,10 @@ void PrefsDialog::MakeEditorTab()
+
+ new FXHorizontalSeparator(column,LAYOUT_SIDE_TOP|LAYOUT_FILL_X|SEPARATOR_GROOVE);
+ chk=new FXCheckButton(column, _("Open 7-bit ASCII files as UTF-8"), prefs, Settings::ID_TOGGLE_ASCII_DEFAULT);
+- chk->setCheck(!prefs->DefaultToAscii, FALSE);
++ chk->setCheck(!prefs->DefaultToAscii, false);
+ chk->setPadBottom(4);
+ chk=new FXCheckButton(column, _("Treat other files as broken UTF-8"), prefs, Settings::ID_TOGGLE_SBCS_DEFAULT);
+- chk->setCheck(!prefs->DefaultToSbcs, FALSE);
++ chk->setCheck(!prefs->DefaultToSbcs, false);
+ chk->setPadBottom(8);
+ spinframe=new FXHorizontalFrame(column);
+ new FXLabel(spinframe, _("Default file format:"));
+@@ -651,7 +651,7 @@ void PrefsDialog::MakeEditorTab()
+
+ chk=new FXCheckButton(column, _("Show line endings with \"View Whitespace\""),
+ prefs, Settings::ID_TOGGLE_VIEW_WHITESPACE_EOL);
+- chk->setCheck(prefs->WhitespaceShowsEOL, FALSE);
++ chk->setCheck(prefs->WhitespaceShowsEOL, false);
+ chk->setPadLeft(6);
+ }
+
Copied and modified: head/editors/fxite/files/patch-src_prefdlg__sntx.cpp (from r461983, head/editors/fxite/files/patch-src__prefdlg_sntx.cpp)
==============================================================================
--- head/editors/fxite/files/patch-src__prefdlg_sntx.cpp Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_prefdlg__sntx.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -1,6 +1,6 @@
--- src/prefdlg_sntx.cpp.orig 2013-10-03 09:22:51 UTC
+++ src/prefdlg_sntx.cpp
-@@ -84,7 +84,7 @@ long MyColorWell::onDoubleClicked(FXObje
+@@ -84,7 +84,7 @@ long MyColorWell::onDoubleClicked(FXObject*o,FXSelecto
colordialog.setSelector(ID_COLORDIALOG);
colordialog.setRGBA(oldcolor);
colordialog.setOpaqueOnly(isOpaqueOnly());
Copied and modified: head/editors/fxite/files/patch-src_recorder.cpp (from r461983, head/editors/fxite/files/patch-src__recorder.cpp)
==============================================================================
--- head/editors/fxite/files/patch-src__recorder.cpp Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_recorder.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -8,3 +8,12 @@
#include "macro.h"
#include "intl.h"
+@@ -288,7 +289,7 @@ void MacroRecorder::translate(TranslateFunc callback,
+ break;
+ }
+ case SCI_SELECTALL: {
+- text=_LUAMOD_".select(0,"_LUAMOD_".nchars())";
++ text=_LUAMOD_".select(0," _LUAMOD_ ".nchars())";
+ break;
+ }
+
Copied and modified: head/editors/fxite/files/patch-src_scidoc.cpp (from r461983, head/editors/fxite/files/patch-src__scidoc.cpp)
==============================================================================
--- head/editors/fxite/files/patch-src__scidoc.cpp Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_scidoc.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -1,6 +1,6 @@
--- src/scidoc.cpp.orig 2013-10-03 09:22:51 UTC
+++ src/scidoc.cpp
-@@ -620,7 +620,11 @@ bool SciDoc::SetLanguageForHeader(const
+@@ -620,7 +620,11 @@ bool SciDoc::SetLanguageForHeader(const FXString &fn)
} else {
// Take a wild guess - if the file contains the word "class" it's probably C++
const char *content=(const char*)(sendMessage(SCI_GETCHARACTERPOINTER,0,0));
Copied and modified: head/editors/fxite/files/patch-src_scisrch.cpp (from r461983, head/editors/fxite/files/patch-src__scisrch.cpp)
==============================================================================
--- head/editors/fxite/files/patch-src__scisrch.cpp Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_scisrch.cpp Fri Feb 16 08:12:16 2018 (r461984)
@@ -13,7 +13,7 @@
#if 1
// The capitalization of text inserted by `&' or `\1', `\2', ... `\9' can be altered by
-@@ -222,7 +228,7 @@ int SciSearch::FindTextNoSel(const FXStr
+@@ -222,7 +228,7 @@ int SciSearch::FindTextNoSel(const FXString &what, FXu
if (fm<0) { fm=0; }
if (to>len) { to=len; }
FXuint dirn=isfwd?REX_FORWARD:REX_BACKWARD;
@@ -22,7 +22,7 @@
beg=isfwd?begs[0]:ends[0];
end=isfwd?ends[0]:begs[0];
return 1;
-@@ -256,8 +262,8 @@ bool SciSearch::FindText(const FXString
+@@ -256,8 +262,8 @@ bool SciSearch::FindText(const FXString &what, FXuint
long fm = isfwd? pos : 0;
long to = isfwd? len : (pos-1);
if (
@@ -33,7 +33,7 @@
) {
SciMsg(SCI_SETTARGETSTART,begs[0],0);
SciMsg(SCI_SETTARGETEND,ends[0],0);
-@@ -383,8 +389,8 @@ long SciSearch::ReplaceAllInDoc(const FX
+@@ -383,8 +389,8 @@ long SciSearch::ReplaceAllInDoc(const FXString &search
SciMsg(SCI_SETSEARCHFLAGS,0,0);
SciMsg(SCI_BEGINUNDOACTION,0,0);
while (1) {
@@ -44,7 +44,7 @@
SciMsg(SCI_SETTARGETSTART,begs[0],0);
SciMsg(SCI_SETTARGETEND,ends[0],0);
FXString newstr=DoSubstitute(content,begs,ends,repl_template,MAX_CAPTURES);
-@@ -438,7 +444,7 @@ long SciSearch::ReplaceAllInSel(const FX
+@@ -438,7 +444,7 @@ long SciSearch::ReplaceAllInSel(const FXString &search
SciMsg(SCI_SETSEARCHFLAGS,0,0);
if (bol_only) { // Special case, start of first line
@@ -53,7 +53,7 @@
SciMsg(SCI_SETTARGETSTART,begs[0],0);
SciMsg(SCI_SETTARGETEND,ends[0],0);
FXString newstr=DoSubstitute(content,begs,ends,repl_template,MAX_CAPTURES);
-@@ -452,7 +458,7 @@ long SciSearch::ReplaceAllInSel(const FX
+@@ -452,7 +458,7 @@ long SciSearch::ReplaceAllInSel(const FXString &search
long substart=start;
while (1) {
if (end<=substart) { break; }
Copied: head/editors/fxite/files/patch-src_tagread.cpp (from r461983, head/editors/fxite/files/patch-src__tagread.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/fxite/files/patch-src_tagread.cpp Fri Feb 16 08:12:16 2018 (r461984, copy of r461983, head/editors/fxite/files/patch-src__tagread.cpp)
@@ -0,0 +1,33 @@
+--- src/tagread.cpp.orig 2013-10-03 09:22:51 UTC
++++ src/tagread.cpp
+@@ -532,11 +532,11 @@ void AutoCompleter::Show(SciDoc*sci)
+ if (no()&&sci->PrefixAtPos(part)) {
+ FXint partlen=part.length();
+ FXint len=0; // save lots of reallocs by calculating overall length first
+- for (FXint i=first(); i<=last(); i=next(i)) {
+- const char*ctag=key(i);
+- int taglen=strlen(ctag);
+- if ((taglen>partlen)&&(strncmp(part.text(),ctag,partlen)==0)) {
+- replace(ctag,(void*)((FXival)1)); // flag it for inclusion
++ for (FXint i=0; i<TotalSlotsInDict(this); ++i) {
++ FXString ctag=key(i);
++ int taglen=ctag.length();
++ if ((taglen>partlen)&&(compare(part,ctag,partlen)==0)) {
++ ReplaceInDict(this,ctag.text(),(void*)((FXival)1)); // flag it for inclusion
+ len+=taglen+1; // count its length
+ }
+ }
+@@ -544,10 +544,10 @@ void AutoCompleter::Show(SciDoc*sci)
+ FXString list=FXString::null;
+ list.length(len);
+ list.trunc(0);
+- for (FXint i=first(); i<=last(); i=next(i)) {
++ for (FXint i=0; i<TotalSlotsInDict(this); ++i) {
+ if (data(i)) {
+- const char*ctag=key(i);
+- replace(ctag,NULL); // reset our flag
++ FXString ctag=key(i);
++ ReplaceInDict(this,ctag.text(),NULL); // reset our flag
+ list.append(ctag);
+ list.append(' ');
+ }
Copied and modified: head/editors/fxite/files/patch-src_tagread.h (from r461983, head/editors/fxite/files/patch-src__tagread.h)
==============================================================================
--- head/editors/fxite/files/patch-src__tagread.h Fri Feb 16 05:37:11 2018 (r461983, copy source)
+++ head/editors/fxite/files/patch-src_tagread.h Fri Feb 16 08:12:16 2018 (r461984)
@@ -1,6 +1,6 @@
--- src/tagread.h.orig 2013-10-03 09:22:51 UTC
+++ src/tagread.h
-@@ -26,7 +26,7 @@ public:
+@@ -26,7 +26,7 @@ class TagHandler: public FXObject { (public)
Copied: head/editors/fxite/files/patch-src_theme.cpp (from r461983, head/editors/fxite/files/patch-src__theme.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/fxite/files/patch-src_theme.cpp Fri Feb 16 08:12:16 2018 (r461984, copy of r461983, head/editors/fxite/files/patch-src__theme.cpp)
@@ -0,0 +1,29 @@
+--- src/theme.cpp.orig 2013-10-03 09:22:51 UTC
++++ src/theme.cpp
+@@ -644,16 +644,16 @@ void ThemeGUI::SetDemoColors()
+ long ThemeGUI::onSelectTheme(FXObject*o, FXSelector sel, void*p)
+ {
+ AppColors*ac=(AppColors*)(list->getItemData((FXint)((FXival)p)));
+- cw_base->setRGBA(ac->base,TRUE);
+- cw_bord->setRGBA(ac->border,TRUE);
+- cw_fore->setRGBA(ac->fore,TRUE);
+- cw_back->setRGBA(ac->back,TRUE);
+- cw_self->setRGBA(ac->selfore,TRUE);
+- cw_selb->setRGBA(ac->selback,TRUE);
+- cw_menf->setRGBA(ac->selmenutext,TRUE);
+- cw_menb->setRGBA(ac->selmenuback,TRUE);
+- cw_tipf->setRGBA(ac->tipfore,TRUE);
+- cw_tipb->setRGBA(ac->tipback,TRUE);
++ cw_base->setRGBA(ac->base,true);
++ cw_bord->setRGBA(ac->border,true);
++ cw_fore->setRGBA(ac->fore,true);
++ cw_back->setRGBA(ac->back,true);
++ cw_self->setRGBA(ac->selfore,true);
++ cw_selb->setRGBA(ac->selback,true);
++ cw_menf->setRGBA(ac->selmenutext,true);
++ cw_menb->setRGBA(ac->selmenuback,true);
++ cw_tipf->setRGBA(ac->tipfore,true);
++ cw_tipb->setRGBA(ac->tipback,true);
+ if (&custom_colors!=ac) {
+ memcpy(&custom_colors.base,&ac->base,sizeof(AppColors)-sizeof(char*));
+ }
More information about the svn-ports-all
mailing list