Commit patch [ 1559950 ] fix mem leaks in wx{Dir|File}Dialog

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

diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index 5bc46413e9ece2369b20ae2977144823dacb6e93..7b1b22db036f155a0a91edfcbdab733489e1a5b6 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


@@ -15,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)
 


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

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