Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore MSW's colour picker

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-12-28 22:12:32 +00:00
parent 73f462913d
commit da1f0e87e2
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/generic/clrpickerg.cpp
View File

@@ -51,7 +51,7 @@ bool wxGenericColourButton::Create( wxWindow *parent, wxWindowID id,
// create this button // create this button
if (!wxBitmapButton::Create( parent, id, m_bitmap, pos, if (!wxBitmapButton::Create( parent, id, m_bitmap, pos,
size, style, validator, name )) size, style | wxBU_AUTODRAW, validator, name ))
{ {
wxFAIL_MSG( wxT("wxGenericColourButton creation failed") ); wxFAIL_MSG( wxT("wxGenericColourButton creation failed") );
return false; return false;
@@ -105,19 +105,27 @@ void wxGenericColourButton::UpdateColour()
dc.SetPen( *wxTRANSPARENT_PEN ); dc.SetPen( *wxTRANSPARENT_PEN );
dc.SetBrush( wxBrush(m_colour) ); dc.SetBrush( wxBrush(m_colour) );
dc.DrawRectangle( 0,0,m_bitmap.GetWidth(),m_bitmap.GetHeight() ); dc.DrawRectangle( 0,0,m_bitmap.GetWidth(),m_bitmap.GetHeight() );
// if ( HasFlag(wxCLRP_SHOW_LABEL) )
{
wxColour col( ~m_colour.Red(), ~m_colour.Green(), ~m_colour.Blue() );
dc.SetTextForeground( col );
dc.SetFont( GetFont() );
dc.DrawText( m_colour.GetAsString(wxC2S_HTML_SYNTAX), 0, 0 );
}
dc.SelectObject( wxNullBitmap ); dc.SelectObject( wxNullBitmap );
SetBitmapLabel( m_bitmap ); SetBitmapLabel( m_bitmap );
#if 0
if ( HasFlag(wxCLRP_SHOW_LABEL) )
SetLabel(m_colour.GetAsString(wxC2S_HTML_SYNTAX));
#endif
} }
wxSize wxGenericColourButton::DoGetBestSize() const wxSize wxGenericColourButton::DoGetBestSize() const
{ {
wxSize sz(wxBitmapButton::DoGetBestSize()); wxSize sz(wxBitmapButton::DoGetBestSize());
#ifdef __WXMAC__
sz.y += 6; sz.y += 6;
#else
sz.y += 2;
#endif
sz.x += 30; sz.x += 30;
if ( HasFlag(wxCLRP_SHOW_LABEL) ) if ( HasFlag(wxCLRP_SHOW_LABEL) )
return sz; return sz;