use stock pens/colors

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 2756aae706dade59886dcc1ae71303aa141bbd7a..78ab72525061c3986e98a12f966c511784cf611d 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -4330,10 +4330,10 @@ void wxGrid::Init()
     }
     else
     {
     }
     else
     {

-        m_labelBackgroundColour = wxColour( wxT("WHITE") );
+        m_labelBackgroundColour = *wxWHITE;

     }
 
     }
 

-    m_labelTextColour = wxColour( wxT("BLACK") );
+    m_labelTextColour = *wxBLACK;

 
     // init attr cache
     m_attrCache.row = -1;
 
     // init attr cache
     m_attrCache.row = -1;

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 512db25f6d967d8fe9143b7e99a6a07e867e1beb..b08f2f333747e8ac7f4e4a740192c8830fe85469 100644 (file)
--- 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(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
 #else

-    m_mediumShadowPen = wxPen(_T("GREY"), 1, wxSOLID);
-    m_hilightPen = wxPen(_T("WHITE"), 1, wxSOLID);
+    m_mediumShadowPen = *wxGREY_PEN;
+    m_hilightPen = *wxWHITE_PEN;

 #endif
 }
 
 #endif
 }