diff --git a/docs/doxygen/overviews/bookctrl.h b/docs/doxygen/overviews/bookctrl.h
index 17400a7c1c..dcbc8376dc 100644
--- a/docs/doxygen/overviews/bookctrl.h
+++ b/docs/doxygen/overviews/bookctrl.h
@@ -41,12 +41,12 @@ The mapping consists of:
 
 @beginTable
 @row2col{ ::wxBookCtrl, wxChoicebook or wxNotebook }
-@row2col{ @c wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED,
-          @c wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED or
-          @c wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED }
-@row2col{ @c wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGING,
-          @c wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING or
-          @c wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING }
+@row2col{ @c wxEVT_BOOKCTRL_PAGE_CHANGED,
+          @c wxEVT_CHOICEBOOK_PAGE_CHANGED or
+          @c wxEVT_NOTEBOOK_PAGE_CHANGED }
+@row2col{ @c wxEVT_BOOKCTRL_PAGE_CHANGING,
+          @c wxEVT_CHOICEBOOK_PAGE_CHANGING or
+          @c wxEVT_NOTEBOOK_PAGE_CHANGING }
 @row2col{ @c EVT_BOOKCTRL_PAGE_CHANGED(id\, fn),
           @c EVT_CHOICEBOOK_PAGE_CHANGED(id, fn) or
           @c EVT_NOTEBOOK_PAGE_CHANGED(id, fn) }
diff --git a/docs/doxygen/overviews/eventhandling.h b/docs/doxygen/overviews/eventhandling.h
index 5ac2d0b692..9dbf1fceb4 100644
--- a/docs/doxygen/overviews/eventhandling.h
+++ b/docs/doxygen/overviews/eventhandling.h
@@ -225,7 +225,7 @@ global scope as with the event tables), call its Bind<>() method like this:
 @code
 MyFrame::MyFrame(...)
 {
-      Bind(wxEVT_COMMAND_MENU_SELECTED, &MyFrame::OnExit, this, wxID_EXIT);
+      Bind(wxEVT_MENU, &MyFrame::OnExit, this, wxID_EXIT);
 }
 @endcode
 
@@ -324,7 +324,7 @@ MyFrameHandler myFrameHandler;
 
 MyFrame::MyFrame()
 {
-      Bind( wxEVT_COMMAND_MENU_SELECTED, &MyFrameHandler::OnFrameExit,
+      Bind( wxEVT_MENU, &MyFrameHandler::OnFrameExit,
               &myFrameHandler, wxID_EXIT );
 }
 @endcode
@@ -346,7 +346,7 @@ void HandleExit( wxCommandEvent & )
 
 MyFrame::MyFrame()
 {
-    Bind( wxEVT_COMMAND_MENU_SELECTED, &HandleExit, wxID_EXIT );
+    Bind( wxEVT_MENU, &HandleExit, wxID_EXIT );
 }
 @endcode
 
@@ -367,7 +367,7 @@ MyFunctor myFunctor;
 
 MyFrame::MyFrame()
 {
-    Bind( wxEVT_COMMAND_MENU_SELECTED, myFunctor, wxID_EXIT );
+    Bind( wxEVT_MENU, myFunctor, wxID_EXIT );
 }
 @endcode
 
@@ -377,7 +377,7 @@ separate functor class:
 @code
 MyFrame::MyFrame()
 {
-    Bind(wxEVT_COMMAND_MENU_SELECTED,
+    Bind(wxEVT_MENU,
          [](wxCommandEvent&) {
             // Do something useful
          },
@@ -407,7 +407,7 @@ MyFrame::MyFrame()
 {
     function< void ( wxCommandEvent & ) > exitHandler( bind( &MyHandler::OnExit, &myHandler, _1 ));
 
-    Bind( wxEVT_COMMAND_MENU_SELECTED, exitHandler, wxID_EXIT );
+    Bind( wxEVT_MENU, exitHandler, wxID_EXIT );
 }
 @endcode
 
@@ -428,7 +428,7 @@ MyFrame::MyFrame()
     function< void ( wxCommandEvent & ) > exitHandler(
             bind( &MyHandler::OnExit, &myHandler, EXIT_FAILURE, _1, "Bye" ));
 
-    Bind( wxEVT_COMMAND_MENU_SELECTED, exitHandler, wxID_EXIT );
+    Bind( wxEVT_MENU, exitHandler, wxID_EXIT );
 }
 @endcode
 
diff --git a/docs/doxygen/overviews/propgrid.h b/docs/doxygen/overviews/propgrid.h
index f6bc3d3d66..572e0b77ed 100644
--- a/docs/doxygen/overviews/propgrid.h
+++ b/docs/doxygen/overviews/propgrid.h
@@ -807,10 +807,9 @@ See wxPGMultiButton class reference.
 
 @subsection propgrid_customeventhandling Handling Events Passed from Properties
 
-<b>wxEVT_COMMAND_BUTTON_CLICKED </b>(corresponds to event table macro EVT_BUTTON):
-Occurs when editor button click is not handled by the property itself
-(as is the case, for example, if you set property's editor to TextCtrlAndButton
-from the original TextCtrl).
+@c wxEVT_BUTTON: Occurs when editor button click is not handled by the property
+itself (as is the case, for example, if you set property's editor
+to TextCtrlAndButton from the original TextCtrl).
 
 @subsection propgrid_attributes Property Attributes
 
diff --git a/docs/doxygen/overviews/xrc.h b/docs/doxygen/overviews/xrc.h
index 0580ec715e..35e37bbad9 100644
--- a/docs/doxygen/overviews/xrc.h
+++ b/docs/doxygen/overviews/xrc.h
@@ -196,10 +196,10 @@ void MyClass::ShowDialog()
     if (!wxXmlResource::Get()->LoadDialog(&dlg, NULL, "SimpleDialog"))
         return;
 
-    XRCCTRL(dlg, "text", wxTextCtrl)->Bind(wxEVT_COMMAND_TEXT_UPDATED,
+    XRCCTRL(dlg, "text", wxTextCtrl)->Bind(wxEVT_TEXT,
         wxTextEventHandler(MyClass::OnTextEntered), this, XRCID("text"));
 
-    XRCCTRL(dlg, "clickme_btn", wxButton)->Bind(wxEVT_COMMAND_BUTTON_CLICKED,
+    XRCCTRL(dlg, "clickme_btn", wxButton)->Bind(wxEVT_BUTTON,
         wxCommandEventHandler(MyClass::OnClickme), this, XRCID("clickme_btn"));
 
     dlg.ShowModal();