Reenabled deleteallitems events, marked

    with RR.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 09a988cd15e8ef598952a6a3610043a9d7ab719d..15d33a55c195ec713f1c62f4c0e091ec417eeb92 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -1295,19 +1295,20 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             }
 
         case LVN_DELETEALLITEMS:
             }
 
         case LVN_DELETEALLITEMS:

-            // what's the sense of generating a wxWin event for this when
-            // it's absolutely not portable?
-#if 0
-            eventType = wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
+            // What's the sense of generating a wxWin event for this when
+           // it's absolutely not portable?
+            // This is perfectly portable, RR
+#if 1
+           eventType = wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;

             event.m_itemIndex = -1;
             event.m_itemIndex = -1;

-#endif // 0
+#endif // 1

 
             // return TRUE to suppress all additional LVN_DELETEITEM
             // notifications - this makes deleting all items from a list ctrl
             // much faster
             *result = TRUE;
 
 
             // return TRUE to suppress all additional LVN_DELETEITEM
             // notifications - this makes deleting all items from a list ctrl
             // much faster
             *result = TRUE;
 

-            return TRUE;
+           break;

 
         case LVN_DELETEITEM:
             {
 
         case LVN_DELETEITEM:
             {


@@ -1578,6 +1579,14 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     if ( !GetEventHandler()->ProcessEvent(event) )
         return FALSE;
 
     if ( !GetEventHandler()->ProcessEvent(event) )
         return FALSE;
 

+    if (eventType == wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)
+    {
+       // No postprocessing, because we want *return to
+       // be TRUE so that no further DeleteItem events
+       // are sent, RR.
+        return TRUE;
+    }
+

     // post processing
     // ---------------
 
     // post processing
     // ---------------