Fix assorted typos in comments and other non-code.

[wxWidgets.git] / src / msw / treectrl.cpp

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 0ac6f626c0ccec0da55434dc010c097c2f6d5ea8..54211597c106be936fd8bb37f2e1f75c77933659 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98
 // Created:     1997
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98
 // Created:     1997

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -666,8 +665,8 @@ static /* const */ wxEventType gs_expandEvents[IDX_WHAT_MAX][IDX_HOW_MAX];
    but logically it's a const table with the following entries:
 =
 {
    but logically it's a const table with the following entries:
 =
 {

-    { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxEVT_COMMAND_TREE_ITEM_COLLAPSING },
-    { wxEVT_COMMAND_TREE_ITEM_EXPANDED,  wxEVT_COMMAND_TREE_ITEM_EXPANDING  }
+    { wxEVT_TREE_ITEM_COLLAPSED, wxEVT_TREE_ITEM_COLLAPSING },
+    { wxEVT_TREE_ITEM_EXPANDED,  wxEVT_TREE_ITEM_EXPANDING  }

 };
 */
 
 };
 */
 


@@ -726,10 +725,10 @@ void wxTreeCtrl::Init()
 
     // initialize the global array of events now as it can't be done statically
     // with the wxEVT_XXX values being allocated during run-time only
 
     // initialize the global array of events now as it can't be done statically
     // with the wxEVT_XXX values being allocated during run-time only

-    gs_expandEvents[IDX_COLLAPSE][IDX_DONE] = wxEVT_COMMAND_TREE_ITEM_COLLAPSED;
-    gs_expandEvents[IDX_COLLAPSE][IDX_DOING] = wxEVT_COMMAND_TREE_ITEM_COLLAPSING;
-    gs_expandEvents[IDX_EXPAND][IDX_DONE] = wxEVT_COMMAND_TREE_ITEM_EXPANDED;
-    gs_expandEvents[IDX_EXPAND][IDX_DOING] = wxEVT_COMMAND_TREE_ITEM_EXPANDING;
+    gs_expandEvents[IDX_COLLAPSE][IDX_DONE] = wxEVT_TREE_ITEM_COLLAPSED;
+    gs_expandEvents[IDX_COLLAPSE][IDX_DOING] = wxEVT_TREE_ITEM_COLLAPSING;
+    gs_expandEvents[IDX_EXPAND][IDX_DONE] = wxEVT_TREE_ITEM_EXPANDED;
+    gs_expandEvents[IDX_EXPAND][IDX_DOING] = wxEVT_TREE_ITEM_EXPANDING;

 }
 
 bool wxTreeCtrl::Create(wxWindow *parent,
 }
 
 bool wxTreeCtrl::Create(wxWindow *parent,


@@ -1642,11 +1641,11 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item)
 
         if ( next.IsOk() )
         {
 
         if ( next.IsOk() )
         {

-            wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, next);
+            wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, next);

 
             if ( IsTreeEventAllowed(changingEvent) )
             {
 
             if ( IsTreeEventAllowed(changingEvent) )
             {

-                wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this, next);
+                wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this, next);

                 (void)HandleTreeEvent(changedEvent);
             }
             else
                 (void)HandleTreeEvent(changedEvent);
             }
             else


@@ -1739,7 +1738,7 @@ void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
 
     if ( IsExpanded(item) )
     {
 
     if ( IsExpanded(item) )
     {

-        wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSING,
+        wxTreeEvent event(wxEVT_TREE_ITEM_COLLAPSING,

                           this, wxTreeItemId(item));
 
         if ( !IsTreeEventAllowed(event) )
                           this, wxTreeItemId(item));
 
         if ( !IsTreeEventAllowed(event) )


@@ -1751,7 +1750,7 @@ void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
         if ( IsExpanded(item) )
             return;
 
         if ( IsExpanded(item) )
             return;
 

-        wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSED, this, item);
+        wxTreeEvent event(wxEVT_TREE_ITEM_COLLAPSED, this, item);

         (void)HandleTreeEvent(event);
     }
     //else: change didn't took place, so do nothing at all
         (void)HandleTreeEvent(event);
     }
     //else: change didn't took place, so do nothing at all


@@ -1792,7 +1791,7 @@ void wxTreeCtrl::Unselect()
 
     if ( HasFlag(wxTR_MULTIPLE) )
     {
 
     if ( HasFlag(wxTR_MULTIPLE) )
     {

-        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,

                                   this, wxTreeItemId());
         changingEvent.m_itemOld = htFocus;
 
                                   this, wxTreeItemId());
         changingEvent.m_itemOld = htFocus;
 


@@ -1800,7 +1799,7 @@ void wxTreeCtrl::Unselect()
         {
             ClearFocusedItem();
 
         {
             ClearFocusedItem();
 

-            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                      this, wxTreeItemId());
             changedEvent.m_itemOld = htFocus;
             (void)HandleTreeEvent(changedEvent);
                                      this, wxTreeItemId());
             changedEvent.m_itemOld = htFocus;
             (void)HandleTreeEvent(changedEvent);


@@ -1832,14 +1831,14 @@ void wxTreeCtrl::UnselectAll()
         HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
         if ( !htFocus ) return;
 
         HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
         if ( !htFocus ) return;
 

-        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this);
+        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this);

         changingEvent.m_itemOld = htFocus;
 
         if ( IsTreeEventAllowed(changingEvent) )
         {
             DoUnselectAll();
 
         changingEvent.m_itemOld = htFocus;
 
         if ( IsTreeEventAllowed(changingEvent) )
         {
             DoUnselectAll();
 

-            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this);
+            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this);

             changedEvent.m_itemOld = htFocus;
             (void)HandleTreeEvent(changedEvent);
         }
             changedEvent.m_itemOld = htFocus;
             (void)HandleTreeEvent(changedEvent);
         }


@@ -1870,14 +1869,14 @@ void wxTreeCtrl::SelectChildren(const wxTreeItemId& parent)
 
     HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
 
 
     HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
 

-    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this);
+    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this);

     changingEvent.m_itemOld = htFocus;
 
     if ( IsTreeEventAllowed(changingEvent) )
     {
         DoSelectChildren(parent);
 
     changingEvent.m_itemOld = htFocus;
 
     if ( IsTreeEventAllowed(changingEvent) )
     {
         DoSelectChildren(parent);
 

-        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this);
+        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this);

         changedEvent.m_itemOld = htFocus;
         (void)HandleTreeEvent(changedEvent);
     }
         changedEvent.m_itemOld = htFocus;
         (void)HandleTreeEvent(changedEvent);
     }


@@ -1902,7 +1901,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
 
     if ( HasFlag(wxTR_MULTIPLE) )
     {
 
     if ( HasFlag(wxTR_MULTIPLE) )
     {

-        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);
+        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, item);

 
         if ( IsTreeEventAllowed(changingEvent) )
         {
 
         if ( IsTreeEventAllowed(changingEvent) )
         {


@@ -1914,7 +1913,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
                 SetFocusedItem(item);
             }
 
                 SetFocusedItem(item);
             }
 

-            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                      this, item);
             (void)HandleTreeEvent(changedEvent);
         }
                                      this, item);
             (void)HandleTreeEvent(changedEvent);
         }


@@ -1938,7 +1937,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
         // not so send the events ourselves and ignore those generated by
         // TreeView_SelectItem() if m_changingSelection is set.
         wxTreeEvent
         // not so send the events ourselves and ignore those generated by
         // TreeView_SelectItem() if m_changingSelection is set.
         wxTreeEvent

-            changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, itemNew);
+            changingEvent(wxEVT_TREE_SEL_CHANGING, this, itemNew);

         changingEvent.SetOldItem(itemOld);
 
         if ( IsTreeEventAllowed(changingEvent) )
         changingEvent.SetOldItem(itemOld);
 
         if ( IsTreeEventAllowed(changingEvent) )


@@ -1953,7 +1952,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
             {
                 ::SetFocus(GetHwnd(), HITEM(item));
 
             {
                 ::SetFocus(GetHwnd(), HITEM(item));
 

-                wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                          this, itemNew);
                 changedEvent.SetOldItem(itemOld);
                 (void)HandleTreeEvent(changedEvent);
                                          this, itemNew);
                 changedEvent.SetOldItem(itemOld);
                 (void)HandleTreeEvent(changedEvent);


@@ -2193,7 +2192,7 @@ bool wxTreeCtrl::MSWShouldPreProcessMessage(WXMSG* msg)
         // conjunction with modifiers
         if ( (msg->wParam == VK_RETURN) && !wxIsAnyModifierDown() )
         {
         // conjunction with modifiers
         if ( (msg->wParam == VK_RETURN) && !wxIsAnyModifierDown() )
         {

-            // we need VK_RETURN to generate wxEVT_COMMAND_TREE_ITEM_ACTIVATED
+            // we need VK_RETURN to generate wxEVT_TREE_ITEM_ACTIVATED

             return false;
         }
     }
             return false;
         }
     }


@@ -2207,7 +2206,7 @@ bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id_)
 
     if ( cmd == EN_UPDATE )
     {
 
     if ( cmd == EN_UPDATE )
     {

-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, id);
+        wxCommandEvent event(wxEVT_TEXT, id);

         event.SetEventObject( this );
         ProcessCommand(event);
     }
         event.SetEventObject( this );
         ProcessCommand(event);
     }


@@ -2251,7 +2250,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
 
             if ( vkey != VK_RETURN && bCtrl )
             {
 
             if ( vkey != VK_RETURN && bCtrl )
             {

-                wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,

                                           this, htSel);
                 changingEvent.m_itemOld = htSel;
 
                                           this, htSel);
                 changingEvent.m_itemOld = htSel;
 


@@ -2259,7 +2258,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                 {
                     DoToggleItemSelection(wxTreeItemId(htSel));
 
                 {
                     DoToggleItemSelection(wxTreeItemId(htSel));
 

-                    wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                    wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                              this, htSel);
                     changedEvent.m_itemOld = htSel;
                     (void)HandleTreeEvent(changedEvent);
                                              this, htSel);
                     changedEvent.m_itemOld = htSel;
                     (void)HandleTreeEvent(changedEvent);


@@ -2272,7 +2271,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
 
                 if ( count != 1 || HITEM(selections[0]) != htSel )
                 {
 
                 if ( count != 1 || HITEM(selections[0]) != htSel )
                 {

-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,

                                               this, htSel);
                     changingEvent.m_itemOld = htSel;
 
                                               this, htSel);
                     changingEvent.m_itemOld = htSel;
 


@@ -2281,7 +2280,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                         DoUnselectAll();
                         DoSelectItem(wxTreeItemId(htSel));
 
                         DoUnselectAll();
                         DoSelectItem(wxTreeItemId(htSel));
 

-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                                  this, htSel);
                         changedEvent.m_itemOld = htSel;
                         (void)HandleTreeEvent(changedEvent);
                                                  this, htSel);
                         changedEvent.m_itemOld = htSel;
                         (void)HandleTreeEvent(changedEvent);


@@ -2316,7 +2315,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                     break;
                 }
 
                     break;
                 }
 

-                wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,

                                           this, next);
                 changingEvent.m_itemOld = htSel;
 
                                           this, next);
                 changingEvent.m_itemOld = htSel;
 


@@ -2326,7 +2325,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                     DoSelectItem(next);
                     SetFocusedItem(next);
 
                     DoSelectItem(next);
                     SetFocusedItem(next);
 

-                    wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                    wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                              this, next);
                     changedEvent.m_itemOld = htSel;
                     (void)HandleTreeEvent(changedEvent);
                                              this, next);
                     changedEvent.m_itemOld = htSel;
                     (void)HandleTreeEvent(changedEvent);


@@ -2351,7 +2350,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                 if ( bShift && SelectRange(GetHwnd(), HITEM(m_htSelStart), HITEM(next),
                      SR_UNSELECT_OTHERS | SR_SIMULATE) )
                 {
                 if ( bShift && SelectRange(GetHwnd(), HITEM(m_htSelStart), HITEM(next),
                      SR_UNSELECT_OTHERS | SR_SIMULATE) )
                 {

-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, next);
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, next);

                     changingEvent.m_itemOld = htSel;
 
                     if ( IsTreeEventAllowed(changingEvent) )
                     changingEvent.m_itemOld = htSel;
 
                     if ( IsTreeEventAllowed(changingEvent) )


@@ -2359,7 +2358,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                         SelectRange(GetHwnd(), HITEM(m_htSelStart), HITEM(next),
                                     SR_UNSELECT_OTHERS);
 
                         SelectRange(GetHwnd(), HITEM(m_htSelStart), HITEM(next),
                                     SR_UNSELECT_OTHERS);
 

-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this, next);
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this, next);

                         changedEvent.m_itemOld = htSel;
                         (void)HandleTreeEvent(changedEvent);
                     }
                         changedEvent.m_itemOld = htSel;
                         (void)HandleTreeEvent(changedEvent);
                     }


@@ -2380,7 +2379,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
 
                 if ( next.IsOk() && !IsHiddenRoot(next) )
                 {
 
                 if ( next.IsOk() && !IsHiddenRoot(next) )
                 {

-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,

                                               this, next);
                     changingEvent.m_itemOld = htSel;
 
                                               this, next);
                     changingEvent.m_itemOld = htSel;
 


@@ -2390,7 +2389,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                         DoSelectItem(next);
                         SetFocusedItem(next);
 
                         DoSelectItem(next);
                         SetFocusedItem(next);
 

-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                                  this, next);
                         changedEvent.m_itemOld = htSel;
                         (void)HandleTreeEvent(changedEvent);
                                                  this, next);
                         changedEvent.m_itemOld = htSel;
                         (void)HandleTreeEvent(changedEvent);


@@ -2416,7 +2415,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
             {
                 wxTreeItemId next = TreeView_GetChild(GetHwnd(), htSel);
 
             {
                 wxTreeItemId next = TreeView_GetChild(GetHwnd(), htSel);
 

-                wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, next);
+                wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, next);

                 changingEvent.m_itemOld = htSel;
 
                 if ( IsTreeEventAllowed(changingEvent) )
                 changingEvent.m_itemOld = htSel;
 
                 if ( IsTreeEventAllowed(changingEvent) )


@@ -2425,7 +2424,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                     DoSelectItem(next);
                     SetFocusedItem(next);
 
                     DoSelectItem(next);
                     SetFocusedItem(next);
 

-                    wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this, next);
+                    wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this, next);

                     changedEvent.m_itemOld = htSel;
                     (void)HandleTreeEvent(changedEvent);
                 }
                     changedEvent.m_itemOld = htSel;
                     (void)HandleTreeEvent(changedEvent);
                 }


@@ -2473,7 +2472,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                                      HITEM(m_htSelStart), HITEM(next),
                                      SR_UNSELECT_OTHERS | SR_SIMULATE) )
                     {
                                      HITEM(m_htSelStart), HITEM(next),
                                      SR_UNSELECT_OTHERS | SR_SIMULATE) )
                     {

-                        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,

                                                   this, next);
                         changingEvent.m_itemOld = htSel;
 
                                                   this, next);
                         changingEvent.m_itemOld = htSel;
 


@@ -2484,7 +2483,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                                         SR_UNSELECT_OTHERS);
                             SetFocusedItem(next);
 
                                         SR_UNSELECT_OTHERS);
                             SetFocusedItem(next);
 

-                            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                                      this, next);
                             changedEvent.m_itemOld = htSel;
                             (void)HandleTreeEvent(changedEvent);
                                                      this, next);
                             changedEvent.m_itemOld = htSel;
                             (void)HandleTreeEvent(changedEvent);


@@ -2493,7 +2492,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                 }
                 else // no Shift
                 {
                 }
                 else // no Shift
                 {

-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,

                                               this, next);
                     changingEvent.m_itemOld = htSel;
 
                                               this, next);
                     changingEvent.m_itemOld = htSel;
 


@@ -2503,7 +2502,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                         DoSelectItem(next);
                         SetFocusedItem(next);
 
                         DoSelectItem(next);
                         SetFocusedItem(next);
 

-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                                  this, next);
                         changedEvent.m_itemOld = htSel;
                         (void)HandleTreeEvent(changedEvent);
                                                  this, next);
                         changedEvent.m_itemOld = htSel;
                         (void)HandleTreeEvent(changedEvent);


@@ -2595,7 +2594,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                     next = nextTemp;
                 }
 
                     next = nextTemp;
                 }
 

-                wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,

                                           this, next);
                 changingEvent.m_itemOld = htSel;
 
                                           this, next);
                 changingEvent.m_itemOld = htSel;
 


@@ -2606,7 +2605,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
                     DoSelectItem(next);
                     SetFocusedItem(next);
 
                     DoSelectItem(next);
                     SetFocusedItem(next);
 

-                    wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                    wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                              this, next);
                     changedEvent.m_itemOld = htSel;
                     (void)HandleTreeEvent(changedEvent);
                                              this, next);
                     changedEvent.m_itemOld = htSel;
                     (void)HandleTreeEvent(changedEvent);


@@ -2623,7 +2622,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
 
 bool wxTreeCtrl::MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam)
 {
 
 bool wxTreeCtrl::MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam)
 {

-    wxTreeEvent keyEvent(wxEVT_COMMAND_TREE_KEY_DOWN, this);
+    wxTreeEvent keyEvent(wxEVT_TREE_KEY_DOWN, this);

     keyEvent.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN, wParam, lParam);
 
     bool processed = HandleTreeEvent(keyEvent);
     keyEvent.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN, wParam, lParam);
 
     bool processed = HandleTreeEvent(keyEvent);


@@ -2635,7 +2634,7 @@ bool wxTreeCtrl::MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam)
         const HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
         if ( htSel )
         {
         const HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
         if ( htSel )
         {

-            wxTreeEvent activatedEvent(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
+            wxTreeEvent activatedEvent(wxEVT_TREE_ITEM_ACTIVATED,

                                        this, htSel);
             (void)HandleTreeEvent(activatedEvent);
         }
                                        this, htSel);
             (void)HandleTreeEvent(activatedEvent);
         }


@@ -2698,7 +2697,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
         // create the event
         if ( item.IsOk() )
         {
         // create the event
         if ( item.IsOk() )
         {

-            wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_MENU, this, item);
+            wxTreeEvent event(wxEVT_TREE_ITEM_MENU, this, item);

 
             event.m_pointDrag = pt;
 
 
             event.m_pointDrag = pt;
 


@@ -2771,7 +2770,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         break;
                     }
 
                         break;
                     }
 

-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,

                                               this, htItem);
                     changingEvent.m_itemOld = htOldItem;
 
                                               this, htItem);
                     changingEvent.m_itemOld = htOldItem;
 


@@ -2785,7 +2784,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         // reset on any click without Shift
                         m_htSelStart.Unset();
 
                         // reset on any click without Shift
                         m_htSelStart.Unset();
 

-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                                  this, htItem);
                         changedEvent.m_itemOld = htOldItem;
                         (void)HandleTreeEvent(changedEvent);
                                                  this, htItem);
                         changedEvent.m_itemOld = htOldItem;
                         (void)HandleTreeEvent(changedEvent);


@@ -2820,7 +2819,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 
                     if ( willChange )
                     {
 
                     if ( willChange )
                     {

-                        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,

                                                   this, htItem);
                         changingEvent.m_itemOld = htOldItem;
 
                                                   this, htItem);
                         changingEvent.m_itemOld = htOldItem;
 


@@ -2840,7 +2839,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 
                             SetFocusedItem(wxTreeItemId(htItem));
 
 
                             SetFocusedItem(wxTreeItemId(htItem));
 

-                            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                                      this, htItem);
                             changedEvent.m_itemOld = htOldItem;
                             (void)HandleTreeEvent(changedEvent);
                                                      this, htItem);
                             changedEvent.m_itemOld = htOldItem;
                             (void)HandleTreeEvent(changedEvent);


@@ -2871,7 +2870,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         // multiple drag and drop to work.
                         if ( !IsItemSelected(GetHwnd(), htItem))
                         {
                         // multiple drag and drop to work.
                         if ( !IsItemSelected(GetHwnd(), htItem))
                         {

-                            wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                            wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,

                                                       this, htItem);
                             changingEvent.m_itemOld = htOldItem;
 
                                                       this, htItem);
                             changingEvent.m_itemOld = htOldItem;
 


@@ -2881,7 +2880,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                                 DoSelectItem(wxTreeItemId(htItem));
                                 SetFocusedItem(wxTreeItemId(htItem));
 
                                 DoSelectItem(wxTreeItemId(htItem));
                                 SetFocusedItem(wxTreeItemId(htItem));
 

-                                wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                                wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                                          this, htItem);
                                 changedEvent.m_itemOld = htOldItem;
                                 (void)HandleTreeEvent(changedEvent);
                                                          this, htItem);
                                 changedEvent.m_itemOld = htOldItem;
                                 (void)HandleTreeEvent(changedEvent);


@@ -2950,7 +2949,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                 // confusing, so override this default behaviour
                 if ( !IsItemSelected(GetHwnd(), htItem) )
                 {
                 // confusing, so override this default behaviour
                 if ( !IsItemSelected(GetHwnd(), htItem) )
                 {

-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,

                                               this, htItem);
                     changingEvent.m_itemOld = htOldItem;
 
                                               this, htItem);
                     changingEvent.m_itemOld = htOldItem;
 


@@ -2960,7 +2959,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         DoSelectItem(wxTreeItemId(htItem));
                         SetFocusedItem(wxTreeItemId(htItem));
 
                         DoSelectItem(wxTreeItemId(htItem));
                         SetFocusedItem(wxTreeItemId(htItem));
 

-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                                  this, htItem);
                         changedEvent.m_itemOld = htOldItem;
                         (void)HandleTreeEvent(changedEvent);
                                                  this, htItem);
                         changedEvent.m_itemOld = htOldItem;
                         (void)HandleTreeEvent(changedEvent);


@@ -3044,7 +3043,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         {
                             m_mouseUpDeselect = false;
 
                         {
                             m_mouseUpDeselect = false;
 

-                            wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
+                            wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,

                                                       this, htItem);
                             changingEvent.m_itemOld = htOldItem;
 
                                                       this, htItem);
                             changingEvent.m_itemOld = htOldItem;
 


@@ -3054,7 +3053,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                                 DoSelectItem(wxTreeItemId(htItem));
                                 SetFocusedItem(wxTreeItemId(htItem));
 
                                 DoSelectItem(wxTreeItemId(htItem));
                                 SetFocusedItem(wxTreeItemId(htItem));
 

-                                wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
+                                wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,

                                                          this, htItem);
                                 changedEvent.m_itemOld = htOldItem;
                                 (void)HandleTreeEvent(changedEvent);
                                                          this, htItem);
                                 changedEvent.m_itemOld = htOldItem;
                                 (void)HandleTreeEvent(changedEvent);


@@ -3068,7 +3067,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                     {
                         if ( tvht.flags & TVHT_ONITEMSTATEICON )
                         {
                     {
                         if ( tvht.flags & TVHT_ONITEMSTATEICON )
                         {

-                            wxTreeEvent event(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK,
+                            wxTreeEvent event(wxEVT_TREE_STATE_IMAGE_CLICK,

                                               this, htItem);
                             (void)HandleTreeEvent(event);
 
                                               this, htItem);
                             (void)HandleTreeEvent(event);
 


@@ -3093,7 +3092,7 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                     wxDELETE(m_dragImage);
 
                     // generate the drag end event
                     wxDELETE(m_dragImage);
 
                     // generate the drag end event

-                    wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG,
+                    wxTreeEvent event(wxEVT_TREE_END_DRAG,

                                       this, htItem);
                     event.m_pointDrag = wxPoint(x, y);
                     (void)HandleTreeEvent(event);
                                       this, htItem);
                     event.m_pointDrag = wxPoint(x, y);
                     (void)HandleTreeEvent(event);


@@ -3253,13 +3252,13 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     switch ( hdr->code )
     {
         case TVN_BEGINDRAG:
     switch ( hdr->code )
     {
         case TVN_BEGINDRAG:

-            eventType = wxEVT_COMMAND_TREE_BEGIN_DRAG;
+            eventType = wxEVT_TREE_BEGIN_DRAG;

             // fall through
 
         case TVN_BEGINRDRAG:
             {
                 if ( eventType == wxEVT_NULL )
             // fall through
 
         case TVN_BEGINRDRAG:
             {
                 if ( eventType == wxEVT_NULL )

-                    eventType = wxEVT_COMMAND_TREE_BEGIN_RDRAG;
+                    eventType = wxEVT_TREE_BEGIN_RDRAG;

                 //else: left drag, already set above
 
                 NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
                 //else: left drag, already set above
 
                 NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;


@@ -3276,7 +3275,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         case TVN_BEGINLABELEDIT:
             {
 
         case TVN_BEGINLABELEDIT:
             {

-                eventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
+                eventType = wxEVT_TREE_BEGIN_LABEL_EDIT;

                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 
                 // although the user event handler may still veto it, it is
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 
                 // although the user event handler may still veto it, it is


@@ -3291,7 +3290,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         case TVN_DELETEITEM:
             {
 
         case TVN_DELETEITEM:
             {

-                eventType = wxEVT_COMMAND_TREE_DELETE_ITEM;
+                eventType = wxEVT_TREE_DELETE_ITEM;

                 NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
 
                 event.m_item = tv->itemOld.hItem;
                 NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
 
                 event.m_item = tv->itemOld.hItem;


@@ -3310,7 +3309,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         case TVN_ENDLABELEDIT:
             {
 
         case TVN_ENDLABELEDIT:
             {

-                eventType = wxEVT_COMMAND_TREE_END_LABEL_EDIT;
+                eventType = wxEVT_TREE_END_LABEL_EDIT;

                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 
                 event.m_item = info->item.hItem;
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 
                 event.m_item = info->item.hItem;


@@ -3334,7 +3333,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 #ifdef TVN_GETINFOTIP
         case TVN_GETINFOTIP:
             {
 #ifdef TVN_GETINFOTIP
         case TVN_GETINFOTIP:
             {

-                eventType = wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP;
+                eventType = wxEVT_TREE_ITEM_GETTOOLTIP;

                 NMTVGETINFOTIP *info = (NMTVGETINFOTIP*)lParam;
 
                 // Which item are we trying to get a tooltip for?
                 NMTVGETINFOTIP *info = (NMTVGETINFOTIP*)lParam;
 
                 // Which item are we trying to get a tooltip for?


@@ -3346,13 +3345,13 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 #endif // !__WXWINCE__
 
         case TVN_GETDISPINFO:
 #endif // !__WXWINCE__
 
         case TVN_GETDISPINFO:

-            eventType = wxEVT_COMMAND_TREE_GET_INFO;
+            eventType = wxEVT_TREE_GET_INFO;

             // fall through
 
         case TVN_SETDISPINFO:
             {
                 if ( eventType == wxEVT_NULL )
             // fall through
 
         case TVN_SETDISPINFO:
             {
                 if ( eventType == wxEVT_NULL )

-                    eventType = wxEVT_COMMAND_TREE_SET_INFO;
+                    eventType = wxEVT_TREE_SET_INFO;

                 //else: get, already set above
 
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
                 //else: get, already set above
 
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;


@@ -3440,7 +3439,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         case TVN_SELCHANGEDW:
             if ( !m_changingSelection )
             {
         case TVN_SELCHANGEDW:
             if ( !m_changingSelection )
             {

-                eventType = wxEVT_COMMAND_TREE_SEL_CHANGED;
+                eventType = wxEVT_TREE_SEL_CHANGED;

             }
             // fall through
 
             }
             // fall through
 


@@ -3449,7 +3448,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             if ( !m_changingSelection )
             {
                 if ( eventType == wxEVT_NULL )
             if ( !m_changingSelection )
             {
                 if ( eventType == wxEVT_NULL )

-                    eventType = wxEVT_COMMAND_TREE_SEL_CHANGING;
+                    eventType = wxEVT_TREE_SEL_CHANGING;

                 //else: already set above
 
                 if (hdr->code == TVN_SELCHANGINGW ||
                 //else: already set above
 
                 if (hdr->code == TVN_SELCHANGINGW ||


@@ -3648,7 +3647,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 if ( htFlags & wxTREE_HITTEST_ONITEMSTATEICON )
                 {
                     event.m_item = item;
                 if ( htFlags & wxTREE_HITTEST_ONITEMSTATEICON )
                 {
                     event.m_item = item;

-                    eventType = wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK;
+                    eventType = wxEVT_TREE_STATE_IMAGE_CLICK;

                 }
 
                 break;
                 }
 
                 break;


@@ -3666,8 +3665,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     {
                         event.m_item = tvhti.hItem;
                         eventType = (int)hdr->code == NM_DBLCLK
                     {
                         event.m_item = tvhti.hItem;
                         eventType = (int)hdr->code == NM_DBLCLK

-                                    ? wxEVT_COMMAND_TREE_ITEM_ACTIVATED
-                                    : wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
+                                    ? wxEVT_TREE_ITEM_ACTIVATED
+                                    : wxEVT_TREE_ITEM_RIGHT_CLICK;

 
                         event.m_pointDrag.x = tvhti.pt.x;
                         event.m_pointDrag.y = tvhti.pt.y;
 
                         event.m_pointDrag.x = tvhti.pt.x;
                         event.m_pointDrag.y = tvhti.pt.y;


@@ -3932,23 +3931,42 @@ void wxTreeCtrl::DoSetItemState(const wxTreeItemId& item, int state)
 // doesn't seem to do anything in other ones (e.g. under Windows 7 the tree
 // control keeps updating its scrollbars while the items are added to it,
 // resulting in horrible flicker when adding even a couple of dozen items).
 // doesn't seem to do anything in other ones (e.g. under Windows 7 the tree
 // control keeps updating its scrollbars while the items are added to it,
 // resulting in horrible flicker when adding even a couple of dozen items).

-// So we hide it instead of freezing -- this still flickers, but actually not
-// as badly as it would if we didn't do it.
+// So we resize it to the smallest possible size instead of freezing -- this
+// still flickers, but actually not as badly as it would if we didn't do it.

 
 void wxTreeCtrl::DoFreeze()
 {
 
 void wxTreeCtrl::DoFreeze()
 {

-    // Notice that we don't call wxWindow::Hide() here as we want the window to
-    // remain shown from wxWidgets point of view and also because
-    // wxWindowMSW::Show() calls Do{Freeze,Thaw}() itself, so we'd get into
-    // infinite recursion this way.

     if ( IsShown() )
     if ( IsShown() )

-        ::ShowWindow(GetHwnd(), SW_HIDE);
+    {
+        RECT rc;
+        ::GetWindowRect(GetHwnd(), &rc);
+        m_thawnSize = wxRectFromRECT(rc).GetSize();
+
+        ::SetWindowPos(GetHwnd(), 0, 0, 0, 1, 1,
+                       SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+    }

 }
 
 void wxTreeCtrl::DoThaw()
 {
     if ( IsShown() )
 }
 
 void wxTreeCtrl::DoThaw()
 {
     if ( IsShown() )

-        ::ShowWindow(GetHwnd(), SW_SHOW);
+    {
+        if ( m_thawnSize != wxDefaultSize )
+        {
+            ::SetWindowPos(GetHwnd(), 0, 0, 0, m_thawnSize.x, m_thawnSize.y,
+                           SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
+        }
+    }
+}
+
+// We also need to override DoSetSize() to ensure that m_thawnSize is reset if
+// the window is resized while being frozen -- in this case, we need to avoid
+// resizing it back to its original, pre-freeze, size when it's thawed.
+void wxTreeCtrl::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    m_thawnSize = wxDefaultSize;
+
+    wxTreeCtrlBase::DoSetSize(x, y, width, height, sizeFlags);

 }
 
 #endif // wxUSE_TREECTRL
 }
 
 #endif // wxUSE_TREECTRL