X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/clrpicker.h diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h index e2d52184e6..efd635bee3 100644 --- a/include/wx/clrpicker.h +++ b/include/wx/clrpicker.h @@ -22,8 +22,15 @@ class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent; -extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxColourPickerWidgetNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxColourPickerCtrlNameStr[]; + +// 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) + // ---------------------------------------------------------------------------- @@ -70,7 +77,7 @@ protected: // same prototype for their contructor (and also explains why we use // define instead of a typedef) // since GTK > 2.4, there is GtkColorButton -#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__) +#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/clrpicker.h" #define wxColourPickerWidget wxColourButton #else