Temporary fix for link error to ~wxZipOutputStream()

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

diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index e29178e7e52cecaef5136be2e38bb37e1b54e19a..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
 
@@ -22,7 +22,7 @@
 #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,