use stock colour/pen/brush objects in samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -619,7 +619,7 @@ wxBitmap ButtonWidgetsPage::CreateBitmap(const wxString& label)
|
||||
wxBitmap bmp(180, 70); // shouldn't hardcode but it's simpler like this
|
||||
wxMemoryDC dc;
|
||||
dc.SelectObject(bmp);
|
||||
dc.SetBackground(wxBrush(*wxCYAN));
|
||||
dc.SetBackground(*wxCYAN_BRUSH);
|
||||
dc.Clear();
|
||||
dc.SetTextForeground(*wxBLACK);
|
||||
dc.DrawLabel(wxStripMenuCodes(m_textLabel->GetValue()) + wxT("\n")
|
||||
|
@@ -541,7 +541,7 @@ void ODComboboxWidgetsPage::CreateCombo()
|
||||
|
||||
if ( m_chkBitmapbutton->GetValue() )
|
||||
{
|
||||
wxBitmap bmpNormal = CreateBitmap(wxColour(0,0,255));
|
||||
wxBitmap bmpNormal = CreateBitmap(*wxBLUE);
|
||||
wxBitmap bmpPressed = CreateBitmap(wxColour(0,0,128));
|
||||
wxBitmap bmpHover = CreateBitmap(wxColour(128,128,255));
|
||||
m_combobox->SetButtonBitmaps(bmpNormal,m_chkStdbutton->GetValue(),bmpPressed,bmpHover);
|
||||
|
@@ -526,7 +526,7 @@ wxBitmap ToggleWidgetsPage::CreateBitmap(const wxString& label)
|
||||
wxBitmap bmp(180, 70); // shouldn't hardcode but it's simpler like this
|
||||
wxMemoryDC dc;
|
||||
dc.SelectObject(bmp);
|
||||
dc.SetBackground(wxBrush(*wxCYAN));
|
||||
dc.SetBackground(*wxCYAN_BRUSH);
|
||||
dc.Clear();
|
||||
dc.SetTextForeground(*wxBLACK);
|
||||
dc.DrawLabel(wxStripMenuCodes(m_textLabel->GetValue()) + wxT("\n")
|
||||
|
Reference in New Issue
Block a user