diff --git a/uppsrc/Report/Report.h b/uppsrc/Report/Report.h index 3916aa7b5..dcc627a84 100644 --- a/uppsrc/Report/Report.h +++ b/uppsrc/Report/Report.h @@ -146,7 +146,7 @@ void Print(Report& r, PrinterJob& pd, bool center = true); bool DefaultPrint(Report& r, int i, const char *_name = t_("Report")); bool Print(Report& r, int i, const char *name = t_("Report")); bool Perform(Report& r, const char *name = t_("Report")); -bool QtfReport(const String& qtf, const char *name = t_("Report")); +bool QtfReport(const String& qtf, const char *name = "", bool pagenumbers = false); END_UPP_NAMESPACE diff --git a/uppsrc/Report/ReportDlg.cpp b/uppsrc/Report/ReportDlg.cpp index 5d07b1595..b3d5ef815 100644 --- a/uppsrc/Report/ReportDlg.cpp +++ b/uppsrc/Report/ReportDlg.cpp @@ -283,9 +283,15 @@ bool Perform(Report& r, const char *caption) return ReportWindow().Perform(r, 100, caption); } -bool QtfReport(const String& qtf, const char *name) +bool QtfReport(const String& qtf, const char *name, bool pagenumbers) { Report r; + if(pagenumbers) { + Report rr; + rr.Footer("[1> $$P]"); + rr << qtf; + r.Footer("[1> $$P/" + AsString(rr.GetCount()) + "]"); + } r << qtf; return Perform(r, name); } diff --git a/uppsrc/ide/Common/ComDlg.cpp b/uppsrc/ide/Common/ComDlg.cpp index 7a07c58b5..0239dd84c 100644 --- a/uppsrc/ide/Common/ComDlg.cpp +++ b/uppsrc/ide/Common/ComDlg.cpp @@ -152,6 +152,8 @@ void ShellOpenFolder(const String& dir) { #if defined(PLATFORM_WIN32) LaunchWebBrowser(dir); + #elif __APPLE__ + system("open " + dir + " &"); #else system("xdg-open " + dir + " &"); #endif diff --git a/uppsrc/plugin/ndisasm/lib/compiler.h b/uppsrc/plugin/ndisasm/lib/compiler.h index 48dae4e8c..14f12f798 100644 --- a/uppsrc/plugin/ndisasm/lib/compiler.h +++ b/uppsrc/plugin/ndisasm/lib/compiler.h @@ -43,6 +43,10 @@ #ifndef NASM_COMPILER_H #define NASM_COMPILER_H 1 +#ifdef __APPLE__ +#define _FORTIFY_SOURCE 0 //aris002 - in the future evaluate how unsafe are the safe funtions and vice versa +#endif + #ifdef HAVE_CONFIG_H # include "config.h" /* autoconf doesn't define these if they are redundant, but we want to