diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h
index ec36c0fe46..4ce47303a4 100644
--- a/include/wx/gtk/tglbtn.h
+++ b/include/wx/gtk/tglbtn.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GTK_TOGGLEBUTTON_H_
 #define _WX_GTK_TOGGLEBUTTON_H_
 
-#include "wx/bitmap.h"
+#include "wx/bmpbndl.h"
 
 //-----------------------------------------------------------------------------
 // wxToggleButton
@@ -85,7 +85,7 @@ public:
     wxBitmapToggleButton() {}
     wxBitmapToggleButton(wxWindow *parent,
                    wxWindowID id,
-                   const wxBitmap& label,
+                   const wxBitmapBundle& label,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
@@ -98,7 +98,7 @@ public:
     // Create the control
     bool Create(wxWindow *parent,
                 wxWindowID id,
-                const wxBitmap& label,
+                const wxBitmapBundle& label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h
index b9658ad106..65b4d7c236 100644
--- a/include/wx/msw/tglbtn.h
+++ b/include/wx/msw/tglbtn.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
-#include "wx/bitmap.h"
+#include "wx/bmpbndl.h"
 
 // Checkbox item (single checkbox)
 class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase
@@ -77,7 +77,7 @@ public:
     wxBitmapToggleButton() {}
     wxBitmapToggleButton(wxWindow *parent,
                    wxWindowID id,
-                   const wxBitmap& label,
+                   const wxBitmapBundle& label,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
@@ -90,7 +90,7 @@ public:
     // Create the control
     bool Create(wxWindow *parent,
                 wxWindowID id,
-                const wxBitmap& label,
+                const wxBitmapBundle& label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h
index 3099c5cd5d..cd856e7c45 100644
--- a/include/wx/osx/tglbtn.h
+++ b/include/wx/osx/tglbtn.h
@@ -58,7 +58,7 @@ public:
     wxBitmapToggleButton() {}
     wxBitmapToggleButton(wxWindow *parent,
                    wxWindowID id,
-                   const wxBitmap& label,
+                   const wxBitmapBundle& label,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
@@ -70,7 +70,7 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
-                const wxBitmap& label,
+                const wxBitmapBundle& label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
diff --git a/include/wx/qt/tglbtn.h b/include/wx/qt/tglbtn.h
index 936669425a..31fb1e17bf 100644
--- a/include/wx/qt/tglbtn.h
+++ b/include/wx/qt/tglbtn.h
@@ -51,7 +51,7 @@ public:
     wxBitmapToggleButton();
     wxBitmapToggleButton(wxWindow *parent,
                    wxWindowID id,
-                   const wxBitmap& label,
+                   const wxBitmapBundle& label,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
@@ -60,7 +60,7 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
-                const wxBitmap& label,
+                const wxBitmapBundle& label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
diff --git a/interface/wx/tglbtn.h b/interface/wx/tglbtn.h
index 52291110c0..db50929575 100644
--- a/interface/wx/tglbtn.h
+++ b/interface/wx/tglbtn.h
@@ -139,7 +139,7 @@ public:
         Internally calls Create().
     */
     wxBitmapToggleButton(wxWindow* parent, wxWindowID id,
-                         const wxBitmap& label,
+                         const wxBitmapBundle& label,
                          const wxPoint& pos = wxDefaultPosition,
                          const wxSize& size = wxDefaultSize,
                          long style = 0,
@@ -150,7 +150,7 @@ public:
         Create method for two-step construction.
     */
     bool Create(wxWindow* parent, wxWindowID id,
-                const wxBitmap& label,
+                const wxBitmapBundle& label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index ed17ae5129..135b4bf498 100644
--- a/src/gtk/tglbtn.cpp
+++ b/src/gtk/tglbtn.cpp
@@ -50,7 +50,7 @@ wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
 wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton);
 
 bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id,
-                            const wxBitmap &bitmap, const wxPoint &pos,
+                            const wxBitmapBundle &bitmap, const wxPoint &pos,
                             const wxSize &size, long style,
                             const wxValidator& validator,
                             const wxString &name)
diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp
index 853b734744..c3eeef9418 100644
--- a/src/msw/tglbtn.cpp
+++ b/src/msw/tglbtn.cpp
@@ -54,7 +54,7 @@ wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
 wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton);
 
 bool wxBitmapToggleButton::Create( wxWindow *parent, wxWindowID id,
-                const wxBitmap& label,const wxPoint& pos, const wxSize& size, long style,
+                const wxBitmapBundle& label,const wxPoint& pos, const wxSize& size, long style,
                 const wxValidator& validator, const wxString& name )
 {
     if (!wxToggleButton::Create( parent, id, wxEmptyString, pos, size, style, validator, name ))
diff --git a/src/osx/tglbtn_osx.cpp b/src/osx/tglbtn_osx.cpp
index 9d1c5568fb..98b461fd65 100644
--- a/src/osx/tglbtn_osx.cpp
+++ b/src/osx/tglbtn_osx.cpp
@@ -107,7 +107,7 @@ bool wxToggleButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton);
 
 bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id,
-                            const wxBitmap& label,
+                            const wxBitmapBundle& label,
                             const wxPoint& pos,
                             const wxSize& size, long style,
                             const wxValidator& validator,
diff --git a/src/qt/tglbtn.cpp b/src/qt/tglbtn.cpp
index b151e346b8..ad48b089e0 100644
--- a/src/qt/tglbtn.cpp
+++ b/src/qt/tglbtn.cpp
@@ -30,7 +30,7 @@ wxBitmapToggleButton::wxBitmapToggleButton()
 
 wxBitmapToggleButton::wxBitmapToggleButton(wxWindow *parent,
                wxWindowID id,
-               const wxBitmap& label,
+               const wxBitmapBundle& label,
                const wxPoint& pos,
                const wxSize& size,
                long style,
@@ -42,7 +42,7 @@ wxBitmapToggleButton::wxBitmapToggleButton(wxWindow *parent,
 
 bool wxBitmapToggleButton::Create(wxWindow *parent,
             wxWindowID id,
-            const wxBitmap& label,
+            const wxBitmapBundle& label,
             const wxPoint& pos,
             const wxSize& size, long style,
             const wxValidator& validator,