projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement GetPageText for the OSX WebKit implementation.
[wxWidgets.git]
/
include
/
wx
/
generic
/
clrpickerg.h
diff --git
a/include/wx/generic/clrpickerg.h
b/include/wx/generic/clrpickerg.h
index 17dc568551bf8a55723ff0d920ec88aa4ddac46a..50988f1924565bf82097a1a8ef3caef312dd5bb4 100644
(file)
--- a/
include/wx/generic/clrpickerg.h
+++ b/
include/wx/generic/clrpickerg.h
@@
-13,20
+13,14
@@
#define _WX_CLRPICKER_H_
#include "wx/button.h"
#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
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxGenericColourButton: a button which brings up a wxColourDialog
//-----------------------------------------------------------------------------
-// show the colour in HTML form (#AABBCC) as colour button label
-#define wxCLRBTN_SHOW_LABEL 100
-
-// the default style
-#define wxCLRBTN_DEFAULT_STYLE (wxCLRBTN_SHOW_LABEL)
-
-
-class WXDLLIMPEXP_CORE wxGenericColourButton : public wxButton,
+class WXDLLIMPEXP_CORE wxGenericColourButton : public wxBitmapButton,
public wxColourPickerWidgetBase
{
public:
public wxColourPickerWidgetBase
{
public:
@@
-70,6
+64,7
@@
public:
protected:
protected:
+ wxBitmap m_bitmap;
wxSize DoGetBestSize() const;
wxSize DoGetBestSize() const;