diff --git a/include/wx/qt/tglbtn.h b/include/wx/qt/tglbtn.h
index 72ff09347a..6cebfe34e1 100644
--- a/include/wx/qt/tglbtn.h
+++ b/include/wx/qt/tglbtn.h
@@ -44,7 +44,7 @@ private:
 
 
 
-class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButtonBase
+class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButton
 {
 public:
     wxBitmapToggleButton();
diff --git a/src/qt/tglbtn.cpp b/src/qt/tglbtn.cpp
index 8434179b9e..b4e971f35c 100644
--- a/src/qt/tglbtn.cpp
+++ b/src/qt/tglbtn.cpp
@@ -52,9 +52,9 @@ void wxQtToggleButton::clicked( bool checked )
     }
 }
 
-wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
+wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
 
-wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxControl);
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton);
 
 wxBitmapToggleButton::wxBitmapToggleButton()
 {