X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b008b592cce934305dfa2eaaae0cd824b0d1e1cb..8173fefe0a9d61cfe5244a301044aa2269bc1c31:/contrib/src/xml/xh_bmpbt.cpp?ds=sidebyside

diff --git a/contrib/src/xml/xh_bmpbt.cpp b/contrib/src/xml/xh_bmpbt.cpp
index cfc3fe5891..314d91e24c 100644
--- a/contrib/src/xml/xh_bmpbt.cpp
+++ b/contrib/src/xml/xh_bmpbt.cpp
@@ -36,17 +36,23 @@ wxBitmapButtonXmlHandler::wxBitmapButtonXmlHandler()
 
 wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
 { 
-    wxBitmapButton *button = new wxBitmapButton(m_ParentAsWindow,
+    wxBitmapButton *button = new wxBitmapButton(m_parentAsWindow,
                                     GetID(),
-                                    GetBitmap(_T("bitmap"), GetSize()),
-                                    //GetBitmap(_T("bitmap")),
+                                    GetBitmap(wxT("bitmap")),
                                     GetPosition(), GetSize(),
-                                    GetStyle(_T("style"), wxBU_AUTODRAW),
+                                    GetStyle(wxT("style"), wxBU_AUTODRAW),
                                     wxDefaultValidator,
                                     GetName());
-    if (GetBool(_T("default"), 0) == 1) button->SetDefault();
+    if (GetBool(wxT("default"), 0) == 1) button->SetDefault();
     SetupWindow(button);
     
+    if (!GetParamValue(wxT("selected")).IsEmpty())
+        button->SetBitmapSelected(GetBitmap(wxT("selected")));
+    if (!GetParamValue(wxT("focus")).IsEmpty())
+        button->SetBitmapFocus(GetBitmap(wxT("focus")));
+    if (!GetParamValue(wxT("disabled")).IsEmpty())
+        button->SetBitmapDisabled(GetBitmap(wxT("disabled")));
+    
     return button;
 }
 
@@ -54,7 +60,7 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
 
 bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
-    return node->GetName() == _T("bitmapbutton");
+    return IsOfClass(node, wxT("wxBitmapButton"));
 }