From 60f61d1988e6e9ff69129fc09da760963a3236be Mon Sep 17 00:00:00 2001 From: "Jason E. Hale" Date: Fri, 16 Feb 2018 08:12:16 +0000 Subject: 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' for 1st argument FXbool prepend(const FXObjectListOf& 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 --- editors/fxite/files/patch-src_theme.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 editors/fxite/files/patch-src_theme.cpp (limited to 'editors/fxite/files/patch-src_theme.cpp') diff --git a/editors/fxite/files/patch-src_theme.cpp b/editors/fxite/files/patch-src_theme.cpp new file mode 100644 index 000000000000..a59bd9fb9c37 --- /dev/null +++ b/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*)); + } -- cgit v1.2.3