don't activate items on Alt-Space or Alt-Enter (#9615)

[wxWidgets.git] / src / xrc / xh_bmpbt.cpp

diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index 321b36c0b5667af63501b6a448e8cacd1a84d28c..bdf588ac9bc35c6e513e431b11fc5e549c13b3b9 100644 (file)
--- a/src/xrc/xh_bmpbt.cpp
+++ b/src/xrc/xh_bmpbt.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bmpbt.cpp
+// Name:        src/xrc/xh_bmpbt.cpp
 // Purpose:     XRC resource for bitmap buttons
 // Author:      Brian Gavin
 // Created:     2000/09/09
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_bmpbt.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,8 +15,13 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_BMPBUTTON
+
 #include "wx/xrc/xh_bmpbt.h"
-#include <wx/bmpbuttn.h>
+
+#ifndef WX_PRECOMP
+    #include "wx/bmpbuttn.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButtonXmlHandler, wxXmlResourceHandler)
 
@@ -42,7 +43,7 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
 
     button->Create(m_parentAsWindow,
                    GetID(),
-                   GetBitmap(wxT("bitmap")),
+                   GetBitmap(wxT("bitmap"), wxART_BUTTON),
                    GetPosition(), GetSize(),
                    GetStyle(wxT("style"), wxBU_AUTODRAW),
                    wxDefaultValidator,
@@ -51,12 +52,14 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
         button->SetDefault();
     SetupWindow(button);
 
-    if (!GetParamValue(wxT("selected")).IsEmpty())
+    if (GetParamNode(wxT("selected")))
         button->SetBitmapSelected(GetBitmap(wxT("selected")));
-    if (!GetParamValue(wxT("focus")).IsEmpty())
+    if (GetParamNode(wxT("focus")))
         button->SetBitmapFocus(GetBitmap(wxT("focus")));
-    if (!GetParamValue(wxT("disabled")).IsEmpty())
+    if (GetParamNode(wxT("disabled")))
         button->SetBitmapDisabled(GetBitmap(wxT("disabled")));
+    if (GetParamNode(wxT("hover")))
+        button->SetBitmapHover(GetBitmap(wxT("hover")));
 
     return button;
 }
@@ -65,3 +68,5 @@ bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxBitmapButton"));
 }
+
+#endif // wxUSE_XRC && wxUSE_BMPBUTTON