The mmedia contrib requires sys/soundcard.h on unix, so disable it on unix

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

diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index 512575c72998508fb6f4df0edbccae3c3acb2869..81b805b116fffe94db56dfe1d8f7d61137126580 100644 (file)
--- a/src/xrc/xh_bmpbt.cpp
+++ b/src/xrc/xh_bmpbt.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xh_bmpbt.h"
 #endif
 
@@ -19,10 +19,10 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_bmpbt.h"
-#include <wx/bmpbuttn.h>
+#include "wx/bmpbuttn.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButtonXmlHandler, wxXmlResourceHandler)
 
@@ -44,7 +44,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,
@@ -68,4 +68,4 @@ bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxBitmapButton"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC