diff --git a/docs/latex/wx/toolbar.tex b/docs/latex/wx/toolbar.tex
index 5c565091eb..07242ae6bf 100644
--- a/docs/latex/wx/toolbar.tex
+++ b/docs/latex/wx/toolbar.tex
@@ -308,12 +308,6 @@ Returns the left/right and top/bottom margins, which are also used for inter-too
 Gets the maximum size taken up by the tools after layout, including margins.
 This can be used to size a frame around the toolbar window.
 
-\wxheading{Parameters}
-
-\docparam{w}{Receives the maximum horizontal size.}
-
-\docparam{h}{Receives the maximum vertical size.}
-
 \membersection{wxToolBar::GetToolClientData}\label{wxtoolbargettoolclientdata}
 
 \constfunc{wxObject*}{GetToolClientData}{\param{int }{toolIndex}}
diff --git a/docs/latex/wx/wxstring.tex b/docs/latex/wx/wxstring.tex
index 467d206db5..092f1eccee 100644
--- a/docs/latex/wx/wxstring.tex
+++ b/docs/latex/wx/wxstring.tex
@@ -785,11 +785,6 @@ Returns the number of replacements made.
 
 Returns the last {\it count} characters.
 
-\constfunc{wxString}{Right}{\param{char}{ ch}}
-
-Returns all characters after the last occurence of {\it ch}.
-Returns the whole string if {\it ch} is not found.
-
 \membersection{wxString::SetChar}\label{wxstringsetchar}
 
 \func{void}{SetChar}{\param{size\_t}{ n}, \param{char}{ch}}
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 061374546b..7f8fd2847b 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -1048,6 +1048,7 @@ bool wxTreeCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result)
         NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam;
         wxTreeItemData *data = (wxTreeItemData *)tv->itemOld.lParam;
         delete data; // may be NULL, ok
+        processed = TRUE; // Make sure we don't get called twice
     }
 
     *result = !event.IsAllowed();