X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c808858c9141174809b3a8167c7cd21f184dc4c..3cd25cff50f35741c8f5327865068593e214e4ca:/src/generic/clrpickerg.cpp diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp index e0db6bbb01..717b1811ae 100644 --- a/src/generic/clrpickerg.cpp +++ b/src/generic/clrpickerg.cpp @@ -24,11 +24,10 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/window.h" -#endif //WX_PRECOMP +#if wxUSE_COLOURPICKERCTRL #include "wx/clrpicker.h" + #include "wx/colordlg.h" @@ -36,8 +35,6 @@ // implementation // ============================================================================ -#if wxUSE_COLOURPICKERCTRL - wxColourData wxGenericColourButton::ms_data; IMPLEMENT_DYNAMIC_CLASS(wxGenericColourButton, wxButton) @@ -120,4 +117,16 @@ void wxGenericColourButton::UpdateColour() SetLabel(m_colour.GetAsString(wxC2S_HTML_SYNTAX)); } +wxSize wxGenericColourButton::DoGetBestSize() const +{ + wxSize sz(wxButton::DoGetBestSize()); + if ( HasFlag(wxCLRP_SHOW_LABEL) ) + return sz; + + // if we have no label, then make this button a square + // (like e.g. native GTK version of this control) + sz.SetWidth(sz.GetHeight()); + return sz; +} + #endif // wxUSE_COLOURPICKERCTRL