AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ 1528248 ] Fix to the width of the wxGenericColourButton

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2006-07-25 11:41:53 +00:00
parent 75c8d68f1d
commit e8427971f6
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/clrpickerg.h
View File

@ -71,6 +71,8 @@ public:
protected:
wxSize DoGetBestSize() const;
void UpdateColour();
// the colour data shown in wxColourPickerCtrlGeneric

3
src/common/clrpickercmn.cpp
View File

@ -59,7 +59,8 @@ bool wxColourPickerCtrl::Create( wxWindow *parent, wxWindowID id,
// we are not interested to the ID of our picker as we connect
// to its "changed" event dynamically...
m_picker = new wxColourPickerWidget(this, wxID_ANY, col, wxPoint(40,0), wxSize(30,-1),
m_picker = new wxColourPickerWidget(this, wxID_ANY, col,
wxDefaultPosition, wxDefaultSize,
GetPickerStyle(style));
// complete sizer creation

12
src/generic/clrpickerg.cpp
View File

@ -117,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