supporting clang memory management annotations

[wxWidgets.git] / include / wx / generic / clrpickerg.h

diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h
index 758e51619ffb3e9dd9eab3affca52012bfba177c..50988f1924565bf82097a1a8ef3caef312dd5bb4 100644 (file)
--- a/include/wx/generic/clrpickerg.h
+++ b/include/wx/generic/clrpickerg.h
@@ -13,13 +13,14 @@
 #define _WX_CLRPICKER_H_
 
 #include "wx/button.h"
-#include "wx/cmndata.h"
+#include "wx/bmpbuttn.h"
+#include "wx/colourdata.h"
 
 //-----------------------------------------------------------------------------
 // wxGenericColourButton: a button which brings up a wxColourDialog
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGenericColourButton : public wxButton,
+class WXDLLIMPEXP_CORE wxGenericColourButton : public wxBitmapButton,
                                                public wxColourPickerWidgetBase
 {
 public:
@@ -63,6 +64,7 @@ public:
 
 
 protected:
+    wxBitmap    m_bitmap;
 
     wxSize DoGetBestSize() const;