Always link with expat in monolithic build.

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

diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index 81b805b116fffe94db56dfe1d8f7d61137126580..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
 // Purpose:     XRC resource for bitmap buttons
 // Author:      Brian Gavin
 // Created:     2000/09/09


@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xh_bmpbt.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -19,10 +15,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_BMPBUTTON

 
 #include "wx/xrc/xh_bmpbt.h"
 
 #include "wx/xrc/xh_bmpbt.h"

-#include "wx/bmpbuttn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/bmpbuttn.h"
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButtonXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButtonXmlHandler, wxXmlResourceHandler)
 


@@ -53,12 +52,14 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
         button->SetDefault();
     SetupWindow(button);
 
         button->SetDefault();
     SetupWindow(button);
 

-    if (!GetParamValue(wxT("selected")).IsEmpty())
+    if (GetParamNode(wxT("selected")))

         button->SetBitmapSelected(GetBitmap(wxT("selected")));
         button->SetBitmapSelected(GetBitmap(wxT("selected")));

-    if (!GetParamValue(wxT("focus")).IsEmpty())
+    if (GetParamNode(wxT("focus")))

         button->SetBitmapFocus(GetBitmap(wxT("focus")));
         button->SetBitmapFocus(GetBitmap(wxT("focus")));

-    if (!GetParamValue(wxT("disabled")).IsEmpty())
+    if (GetParamNode(wxT("disabled")))

         button->SetBitmapDisabled(GetBitmap(wxT("disabled")));
         button->SetBitmapDisabled(GetBitmap(wxT("disabled")));

+    if (GetParamNode(wxT("hover")))
+        button->SetBitmapHover(GetBitmap(wxT("hover")));

 
     return button;
 }
 
     return button;
 }


@@ -68,4 +69,4 @@ bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxBitmapButton"));
 }
 
     return IsOfClass(node, wxT("wxBitmapButton"));
 }
 

-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_BMPBUTTON