Use wxAlphaPixelData if the source bitmap depth is 32 or if on wxGTK and there is...

[wxWidgets.git] / include / wx / xrc / xh_odcombo.h

diff --git a/include/wx/xrc/xh_odcombo.h b/include/wx/xrc/xh_odcombo.h
index 7febc5590c7aa710a36136c3ed6a9f2f5974cdde..9d7b4fa377d9a83243d0a0d756cee2ed716370bc 100644 (file)
--- a/include/wx/xrc/xh_odcombo.h
+++ b/include/wx/xrc/xh_odcombo.h
@@ -13,20 +13,23 @@
 
 #include "wx/xrc/xmlres.h"
 
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_ODCOMBOBOX
+#if wxUSE_XRC && wxUSE_ODCOMBOBOX

 
 class WXDLLIMPEXP_XRC wxOwnerDrawnComboBoxXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxOwnerDrawnComboBoxXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxOwnerDrawnComboBoxXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxOwnerDrawnComboBoxXmlHandler)
+

 public:
     wxOwnerDrawnComboBoxXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 public:
     wxOwnerDrawnComboBoxXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);

+

 private:
     bool m_insideBox;
     wxArrayString strList;
 };
 
 private:
     bool m_insideBox;
     wxArrayString strList;
 };
 

-#endif
+#endif // wxUSE_XRC && wxUSE_ODCOMBOBOX

 
 #endif // _WX_XH_ODCOMBO_H_
 
 #endif // _WX_XH_ODCOMBO_H_

+