diff --git a/contrib/src/xml/xh_bmpbt.cpp b/contrib/src/xml/xh_bmpbt.cpp
index cfc3fe5891..0fa81797ee 100644
--- a/contrib/src/xml/xh_bmpbt.cpp
+++ b/contrib/src/xml/xh_bmpbt.cpp
@@ -38,8 +38,7 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
 { 
     wxBitmapButton *button = new wxBitmapButton(m_ParentAsWindow,
                                     GetID(),
-                                    GetBitmap(_T("bitmap"), GetSize()),
-                                    //GetBitmap(_T("bitmap")),
+                                    GetBitmap(_T("bitmap")),
                                     GetPosition(), GetSize(),
                                     GetStyle(_T("style"), wxBU_AUTODRAW),
                                     wxDefaultValidator,
@@ -47,6 +46,13 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
     if (GetBool(_T("default"), 0) == 1) button->SetDefault();
     SetupWindow(button);
     
+    if (!GetParamValue(_T("selected")).IsEmpty())
+        button->SetBitmapSelected(GetBitmap(_T("selected")));
+    if (!GetParamValue(_T("focus")).IsEmpty())
+        button->SetBitmapFocus(GetBitmap(_T("focus")));
+    if (!GetParamValue(_T("disabled")).IsEmpty())
+        button->SetBitmapDisabled(GetBitmap(_T("disabled")));
+    
     return button;
 }