Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv25787/src/gui
Modified Files:
wxFolderTree.cpp
Log Message:
fix for a crash in folder tree when using Ctrl-arrow after deleting/removing a folder
from it
Index: wxFolderTree.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderTree.cpp,v
retrieving revision 1.200
retrieving revision 1.201
diff -b -u -2 -r1.200 -r1.201
--- wxFolderTree.cpp 12 Sep 2002 02:36:49 -0000 1.200
+++ wxFolderTree.cpp 18 Sep 2002 14:25:39 -0000 1.201
@@ -314,6 +314,6 @@
wxTreeItemId FindNextUnreadFolder(wxTreeItemId id, bool next = true) const;
- // go to the next folder with unread messages after the given one
- bool GoToNextUnreadFolder(wxFolderTreeNode *nodeStart, bool next = true);
+ // go to the next folder with unread messages after the current one
+ bool GoToNextUnreadFolder(bool next = true);
// go to the home folder, if any
@@ -2191,7 +2191,15 @@
}
-bool wxFolderTreeImpl::GoToNextUnreadFolder(wxFolderTreeNode *node, bool next)
+bool wxFolderTreeImpl::GoToNextUnreadFolder(bool next)
{
- wxTreeItemId id = FindNextUnreadFolder(node->GetId(), next);
+ // start from the beginning if no current node
+ wxFolderTreeNode *node = GetSelection();
+ wxTreeItemId id; // NB: gcc 2.91 dies if we use operator ?: here
+ if ( node )
+ id = node->GetId();
+ else
+ id = GetRootItem();
+
+ id = FindNextUnreadFolder(id, next);
if ( !id.IsOk() )
{
@@ -2648,5 +2656,5 @@
case WXK_UP:
// do go to next or previous folder
- (void)GoToNextUnreadFolder(GetSelection(), keycode == WXK_DOWN);
+ (void)GoToNextUnreadFolder(keycode == WXK_DOWN);
break;
-------------------------------------------------------
This SF.NET email is sponsored by: AMD - Your access to the experts
on Hammer Technology! Open Source & Linux Developers, register now
for the AMD Developer Symposium. Code: EX8664
http://www.developwithamd.com/developerlab
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
