diff --git a/docs/doxygen/overviews/eventhandling.h b/docs/doxygen/overviews/eventhandling.h
index 7394832916..0ff6365ae0 100644
--- a/docs/doxygen/overviews/eventhandling.h
+++ b/docs/doxygen/overviews/eventhandling.h
@@ -315,7 +315,7 @@ In addition to using a method of the object generating the event itself, you
 can use a method from a completely different object as an event handler:
 
 @code
-void MyFrameHandler::OnFrameExit( wxCommandEvent & )
+void MyFrameHandler::OnFrameExit(wxCommandEvent&)
 {
     // Do something useful.
 }
@@ -324,8 +324,8 @@ MyFrameHandler myFrameHandler;
 
 MyFrame::MyFrame()
 {
-      Bind( wxEVT_MENU, &MyFrameHandler::OnFrameExit,
-              &myFrameHandler, wxID_EXIT );
+      Bind(wxEVT_MENU, &MyFrameHandler::OnFrameExit,
+              &myFrameHandler, wxID_EXIT);
 }
 @endcode
 
@@ -339,14 +339,14 @@ To use an ordinary function or a static method as an event handler you would
 write something like this:
 
 @code
-void HandleExit( wxCommandEvent & )
+void HandleExit(wxCommandEvent&)
 {
     // Do something useful
 }
 
 MyFrame::MyFrame()
 {
-    Bind( wxEVT_MENU, &HandleExit, wxID_EXIT );
+    Bind(wxEVT_MENU, &HandleExit, wxID_EXIT);
 }
 @endcode
 
@@ -357,7 +357,7 @@ handler:
 
 struct MyFunctor
 {
-    void operator()( wxCommandEvent & )
+    void operator()(wxCommandEvent&)
     {
         // Do something useful
     }
@@ -367,7 +367,7 @@ MyFunctor myFunctor;
 
 MyFrame::MyFrame()
 {
-    Bind( wxEVT_MENU, myFunctor, wxID_EXIT );
+    Bind(wxEVT_MENU, myFunctor, wxID_EXIT);
 }
 @endcode
 
@@ -389,14 +389,14 @@ Another common example of a generic functor is boost::function<> or, since
 C++11, std::function<>:
 
 @code
-#if __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(10)
+#if wxCHECK_CXX_STD(201103L)
 using namespace std;
 using namespace std::placeholders;
 #else // Pre C++11 compiler
 using namespace boost;
 #endif
 
-void MyHandler::OnExit( wxCommandEvent & )
+void MyHandler::OnExit(wxCommandEvent&)
 {
     // Do something useful
 }
@@ -405,9 +405,9 @@ MyHandler myHandler;
 
 MyFrame::MyFrame()
 {
-    function< void ( wxCommandEvent & ) > exitHandler( bind( &MyHandler::OnExit, &myHandler, _1 ));
+    function<void (wxCommandEvent& )> exitHandler(bind(&MyHandler::OnExit, &myHandler, _1));
 
-    Bind( wxEVT_MENU, exitHandler, wxID_EXIT );
+    Bind(wxEVT_MENU, exitHandler, wxID_EXIT);
 }
 @endcode
 
@@ -416,7 +416,7 @@ With the aid of @c bind<>() you can even use methods or functions which
 don't quite have the correct signature:
 
 @code
-void MyHandler::OnExit( int exitCode, wxCommandEvent &, wxString goodByeMessage )
+void MyHandler::OnExit(int exitCode, wxCommandEvent&, wxString goodByeMessage)
 {
     // Do something useful
 }
@@ -425,10 +425,10 @@ MyHandler myHandler;
 
 MyFrame::MyFrame()
 {
-    function< void ( wxCommandEvent & ) > exitHandler(
-            bind( &MyHandler::OnExit, &myHandler, EXIT_FAILURE, _1, "Bye" ));
+    function<void (wxCommandEvent&)> exitHandler(
+            bind(&MyHandler::OnExit, &myHandler, EXIT_FAILURE, _1, "Bye"));
 
-    Bind( wxEVT_MENU, exitHandler, wxID_EXIT );
+    Bind(wxEVT_MENU, exitHandler, wxID_EXIT);
 }
 @endcode
 
@@ -477,7 +477,7 @@ doesn't count as having handled the event and the search continues):
     checking the static event table entries, so if both a dynamic and a static
     event handler match the same event, the static one is never going to be
     used unless wxEvent::Skip() is called in the dynamic one. Also note that
-    the dynamically bound handlers are searched in order of their registration
+    the dynamically bound handlers are searched in reverse order of their registration
     during program run-time, i.e. later bound handlers take priority over the
     previously bound ones.
     </li>
diff --git a/interface/wx/aui/auibar.h b/interface/wx/aui/auibar.h
index b876b46221..3b6641b310 100644
--- a/interface/wx/aui/auibar.h
+++ b/interface/wx/aui/auibar.h
@@ -150,7 +150,7 @@ enum wxAuiToolBarToolTextOrientation
     wxAuiToolBarEvent is used for the events generated by @ref wxAuiToolBar.
 
     @library{wxaui}
-    @category{aui}
+    @category{aui,events}
 */
 class wxAuiToolBarEvent : public wxNotifyEvent
 {
diff --git a/interface/wx/html/htmlwin.h b/interface/wx/html/htmlwin.h
index caaccdef26..8bb41faef8 100644
--- a/interface/wx/html/htmlwin.h
+++ b/interface/wx/html/htmlwin.h
@@ -559,7 +559,7 @@ wxEventType wxEVT_HTML_LINK_CLICKED;
     @endEventTable
 
     @library{wxhtml}
-    @category{html}
+    @category{html,events}
 */
 class wxHtmlLinkEvent : public wxCommandEvent
 {
@@ -592,7 +592,7 @@ public:
     @endEventTable
 
     @library{wxhtml}
-    @category{html}
+    @category{html,events}
 */
 class wxHtmlCellEvent : public wxCommandEvent
 {
diff --git a/interface/wx/propgrid/propgrid.h b/interface/wx/propgrid/propgrid.h
index 1da72c4a04..b267faa6c2 100644
--- a/interface/wx/propgrid/propgrid.h
+++ b/interface/wx/propgrid/propgrid.h
@@ -1332,7 +1332,7 @@ public:
     @endEventTable
 
     @library{wxpropgrid}
-    @category{propgrid}
+    @category{propgrid,events}
 */
 class wxPropertyGridEvent : public wxCommandEvent
 {
diff --git a/interface/wx/socket.h b/interface/wx/socket.h
index 5d52743ba3..ad29c5a56c 100644
--- a/interface/wx/socket.h
+++ b/interface/wx/socket.h
@@ -479,7 +479,7 @@ public:
     @endEventTable
 
     @library{wxnet}
-    @category{net}
+    @category{net,events}
 
     @see wxSocketBase, wxSocketClient, wxSocketServer
 */
diff --git a/interface/wx/treelist.h b/interface/wx/treelist.h
index 861787e13b..d6d2aa1b00 100644
--- a/interface/wx/treelist.h
+++ b/interface/wx/treelist.h
@@ -902,6 +902,9 @@ public:
 /**
     Event generated by wxTreeListCtrl.
 
+    @category{ctrl,events}
+
+
     @since 2.9.3
  */
 class wxTreeListEvent : public wxNotifyEvent
diff --git a/interface/wx/webrequest.h b/interface/wx/webrequest.h
index 02631c5a20..ff8f100f42 100644
--- a/interface/wx/webrequest.h
+++ b/interface/wx/webrequest.h
@@ -788,7 +788,7 @@ public:
     @since 3.1.5
 
     @library{wxnet}
-    @category{net}
+    @category{net,events}
 
     @see wxWebRequest
 */