Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv6689/src/gui
Modified Files:
wxMDialogs.cpp
Log Message:
corrected assert for not really disabled msg boxes in ReenableDialog
Index: wxMDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMDialogs.cpp,v
retrieving revision 1.405
retrieving revision 1.406
diff -b -u -2 -r1.405 -r1.406
--- wxMDialogs.cpp 30 Sep 2003 14:08:16 -0000 1.405
+++ wxMDialogs.cpp 1 Oct 2003 00:41:26 -0000 1.406
@@ -2360,10 +2360,8 @@
long dummy;
String name;
- bool cont = config->GetFirstEntry(name, dummy);
- while ( cont )
+ for ( bool cont = config->GetFirstEntry(name, dummy);
+ cont;
+ cont = config->GetNextEntry(name, dummy) )
{
- int index = m_listctrl->GetItemCount();
- m_listctrl->InsertItem(index, GetPersMsgBoxHelp(name));
-
// decode the remembered value
String value;
@@ -2381,4 +2379,9 @@
break;
+ case -1:
+ // this is a special hack used by persistent msg boxes, ignore it,
+ // this one is not really disabled
+ continue;
+
default:
FAIL_MSG( _T("unknown message box value") );
@@ -2390,4 +2393,6 @@
}
+ int index = m_listctrl->GetItemCount();
+ m_listctrl->InsertItem(index, GetPersMsgBoxHelp(name));
m_listctrl->SetItem(index, 1, value);
@@ -2424,6 +2429,4 @@
}
entries.Add(name);
-
- cont = config->GetNextEntry(name, dummy);
}
}
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
