X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f26ef31422b9d1496d9f19d53a489f6f04a1090..992527a5738f7fb629d2aaeee64cfc733ddb7e1c:/include/wx/generic/clrpickerg.h diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h index 16fe8413d5..17dc568551 100644 --- a/include/wx/generic/clrpickerg.h +++ b/include/wx/generic/clrpickerg.h @@ -23,7 +23,7 @@ #define wxCLRBTN_SHOW_LABEL 100 // the default style -#define wxCLRBTN_DEFAULT_STYLE wxCLRBTN_SHOW_LABEL +#define wxCLRBTN_DEFAULT_STYLE (wxCLRBTN_SHOW_LABEL) class WXDLLIMPEXP_CORE wxGenericColourButton : public wxButton, @@ -71,6 +71,8 @@ public: protected: + wxSize DoGetBestSize() const; + void UpdateColour(); // the colour data shown in wxColourPickerCtrlGeneric