X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a5f81d8c07022c086723a587488750ef055439e3..dfec0e85c079e4ba336ffa3b78b8aabd8d0ab883:/user/wxLayout/kbList.cpp?ds=sidebyside diff --git a/user/wxLayout/kbList.cpp b/user/wxLayout/kbList.cpp index 7ff7409845..23ead752a5 100644 --- a/user/wxLayout/kbList.cpp +++ b/user/wxLayout/kbList.cpp @@ -6,10 +6,29 @@ * $Id$ * * * * $Log$ - * Revision 1.1 1998/06/29 12:44:36 KB - * Added my wxWindows based layout engine to the repository. - * It arranges text and graphics for display on a wxDC. - * This code is licensed under the LGPL. + * Revision 1.3 1998/11/19 20:34:50 KB + * fixes + * + * Revision 1.8 1998/09/23 08:57:27 KB + * changed deletion behaviour + * + * Revision 1.7 1998/08/16 21:21:29 VZ + * + * 1) fixed config file bug: it was never created (attempt to create ~/.M/config + * always failed, must mkdir("~/.M") first) + * 2) "redesign" of "Folder properties" dialog and bug corrected, small change to + * MInputBox (it was too wide) + * 3) bug in ProvFC when it didn't reckognize the books as being in the correct + * format (=> messages "can't reopen book") corrected + * 4) I tried to enhance MDialog_About(), but it didn't really work... oh well, + * I've never said I was an artist + * + * Revision 1.6 1998/07/08 11:56:56 KB + * M compiles and runs on Solaris 2.5/gcc 2.8/c-client gso + * + * Revision 1.5 1998/06/27 20:07:18 KB + * several bug fixes for kbList + * started adding my layout stuff * * Revision 1.1.1.1 1998/06/13 21:51:12 karsten * initial code @@ -84,13 +103,13 @@ kbList::iterator::operator--() return *this; } kbList::iterator & -kbList::iterator::operator++(int foo) +kbList::iterator::operator++(int /* foo */) { return operator++(); } kbList::iterator & -kbList::iterator::operator--(int bar) +kbList::iterator::operator--(int /* bar */) { return operator--(); } @@ -178,18 +197,14 @@ kbList::insert(kbList::iterator & i, void *element) else if(i.Node() == first) { push_front(element); - return; - } - else if(i.Node() == last) - { - push_back(element); + i = first; return; } i = kbList::iterator(new kbListNode(element, i.Node()->prev, i.Node())); } void -kbList::erase(kbList::iterator & i) +kbList::doErase(kbList::iterator & i) { kbListNode *node = i.Node(), @@ -214,8 +229,9 @@ kbList::erase(kbList::iterator & i) next->prev = prev; // delete this node and contents: - if(ownsEntries) - delete *i; + // now done separately + //if(ownsEntries) + //delete *i; delete i.Node(); // change the iterator to next element: