From b0fa21872629b62df4ae81c1698a342ca200b629 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 27 Apr 2006 04:45:13 +0000 Subject: [PATCH] use stock pens/colors git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/grid.cpp | 4 ++-- src/generic/statusbr.cpp | 14 +++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 2756aae706..78ab725250 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -4330,10 +4330,10 @@ void wxGrid::Init() } else { - m_labelBackgroundColour = wxColour( wxT("WHITE") ); + m_labelBackgroundColour = *wxWHITE; } - m_labelTextColour = wxColour( wxT("BLACK") ); + m_labelTextColour = *wxBLACK; // init attr cache m_attrCache.row = -1; diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 512db25f6d..b08f2f3337 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -358,17 +358,13 @@ void wxStatusBarGeneric::InitColours() m_hilightPen = wxPen(hilightColour, 1, wxSOLID); #elif defined(__WXPM__) m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID); - m_hilightPen = wxPen(_T("WHITE"), 1, wxSOLID); + m_hilightPen = *wxWHITE_PEN; - wxColour vColour; - - vColour.Set(wxString(_T("LIGHT GREY"))); - SetBackgroundColour(vColour); - vColour.Set(wxString(_T("BLACK"))); - SetForegroundColour(vColour); + SetBackgroundColour(*wxLIGHT_GREY); + SetForegroundColour(*wxBLACK); #else - m_mediumShadowPen = wxPen(_T("GREY"), 1, wxSOLID); - m_hilightPen = wxPen(_T("WHITE"), 1, wxSOLID); + m_mediumShadowPen = *wxGREY_PEN; + m_hilightPen = *wxWHITE_PEN; #endif }