mirror of
https://git.freebsd.org/ports.git
synced 2025-06-21 12:40:45 -04:00
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
67 lines
2.6 KiB
C++
67 lines
2.6 KiB
C++
--- src/fxasq.cpp.orig 2013-10-03 09:22:51 UTC
|
|
+++ src/fxasq.cpp
|
|
@@ -133,7 +133,7 @@ int FxAsqWin::Run(FxAsqItem**results)
|
|
dlg->create();
|
|
dlg->setWidth(dlg->getDefaultWidth());
|
|
dlg->setHeight(dlg->getDefaultHeight());
|
|
- for (FXint i=keylist.first(); i<=keylist.last(); i=keylist.next(i))
|
|
+ if (UsedSlotsInDict(&keylist)>0) for (FXint i=0; i<TotalSlotsInDict(&keylist); ++i)
|
|
{
|
|
focused_btn=-1; // Focusing a button doesn't make much sense for interactive dialogs.
|
|
FXWindow*obj=(FXWindow*)(keylist.data(i));
|
|
@@ -186,8 +186,8 @@ int FxAsqWin::Run(FxAsqItem**results)
|
|
|
|
void FxAsqWin::PutResults()
|
|
{
|
|
- for (FXint i=keylist.first(); i<=keylist.last(); i=keylist.next(i)) {
|
|
- const char*k=keylist.key(i);
|
|
+ for (FXint i=0; i<TotalSlotsInDict(&keylist); ++i) {
|
|
+ const char*k=DictKeyName(keylist,i);
|
|
FXWindow*obj=(FXWindow*)keylist.data(i);
|
|
if (k&&obj) {
|
|
if (IsGroup(obj)) {
|
|
@@ -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);
|
|
- FXListBox*list=(FXListBox*)(keylist.find(key));
|
|
+ FXListBox*list=(FXListBox*)(LookupInDict(&keylist,key));
|
|
if (list) {
|
|
list->reparent(frm);
|
|
void*p=list->getUserData();
|
|
@@ -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)
|
|
{
|
|
- FXListBox*list=(FXListBox*)(keylist.find(key));
|
|
+ FXListBox*list=(FXListBox*)(LookupInDict(&keylist,key));
|
|
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, const char*value
|
|
|
|
void FxAsqWin::Group(const char*key, const char*value, const char*label)
|
|
{
|
|
- GroupBox*grp=(GroupBox*)(keylist.find(key));
|
|
+ GroupBox*grp=(GroupBox*)(LookupInDict(&keylist,key));
|
|
if (grp) {
|
|
((FXWindow*)grp)->reparent(userbox);
|
|
grp->setText(label);
|
|
@@ -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)
|
|
{
|
|
- GroupBox*grp=(GroupBox*)(keylist.find(key));
|
|
+ GroupBox*grp=(GroupBox*)(LookupInDict(&keylist,key));
|
|
if (!IsGroup(grp)) {
|
|
grp=new GroupBox(userbox,NULL);
|
|
keylist.insert(key,grp);
|
|
@@ -505,7 +505,7 @@ void FxAsqWin::Font(const char*key, const char*value,
|
|
FxAsqWin::~FxAsqWin()
|
|
{
|
|
void*p=NULL;
|
|
- for (FXint i=keylist.first(); i<=keylist.last(); i=keylist.next(i)) {
|
|
+ for (FXint i=0; i<TotalSlotsInDict(&keylist); ++i) {
|
|
FXWindow*obj=(FXWindow*)(keylist.data(i));
|
|
if (IsList(obj)) {
|
|
FXListBox*listbox=(FXListBox*)obj;
|