wxBLACK usage.

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

demos/forty/card.cpp

@@ -170,7 +170,7 @@ void Card::Draw(wxDC& dc, int x, int y)
         dc.SetBackground(* wxRED_BRUSH);
         dc.SetBackgroundMode(wxSOLID);
         wxBrush* brush = wxTheBrushList->FindOrCreateBrush(
-                            _T("BLACK"), wxCROSSDIAG_HATCH
+                            *wxBLACK, wxCROSSDIAG_HATCH
                             );
         dc.SetBrush(* brush);
 

demos/forty/forty.cpp

@@ -124,7 +124,7 @@ const wxColour& FortyApp::TextColour()
 {
     if (!m_textColour)
     {
-        m_textColour = new wxColour(_T("BLACK"));
+        m_textColour = new wxColour(*wxBLACK);
     }
 
     return *m_textColour;

samples/dialogs/dialogs.cpp

@@ -227,7 +227,7 @@ bool MyApp::OnInit()
     wxInitAllImageHandlers();
 #endif
 
-    m_canvasTextColour = wxColour(_T("BLACK"));
+    m_canvasTextColour = *wxBLACK;
     m_canvasFont = *wxNORMAL_FONT;
 
     // Create the main frame window

samples/image/image.cpp

@@ -765,7 +765,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.SetTextBackground( _T("RED") );
         dc.DrawBitmap( my_smile_xbm, 30, 2010 );
 
-        dc.SetTextForeground( wxT("BLACK") );
+        dc.SetTextForeground( *wxBLACK );
         dc.DrawText( _T("After wxImage conversion"), 150, 1975 );
         dc.DrawText( _T("(red on white)"), 150, 1990 );
         dc.SetTextForeground( wxT("RED") );
@@ -776,7 +776,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );
         dc.DrawBitmap( wxBitmap(i), 150, 2010, true );
-        dc.SetTextForeground( wxT("BLACK") );
+        dc.SetTextForeground( *wxBLACK );
     }
 
 
@@ -805,7 +805,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.SetTextBackground( wxT("GREEN") );
         dc.DrawBitmap( mono, 30, 2130 );
 
-        dc.SetTextForeground( wxT("BLACK") );
+        dc.SetTextForeground( *wxBLACK );
         dc.DrawText( _T("After wxImage conversion"), 150, 2095 );
         dc.DrawText( _T("(red on white)"), 150, 2110 );
         dc.SetTextForeground( wxT("RED") );
@@ -816,7 +816,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );
         dc.DrawBitmap( wxBitmap(i), 150, 2130, true );
-        dc.SetTextForeground( wxT("BLACK") );
+        dc.SetTextForeground( *wxBLACK );
     }
 
     // For testing transparency

src/os2/dc.cpp

@@ -353,11 +353,8 @@ wxDC::wxDC(void)
     m_hPS          = NULL;
     m_bIsPaintTime = false; // True at Paint Time
 
-    wxColour vColor( wxT("BLACK") );
+    m_pen.SetColour(*wxBLACK);
-    m_pen.SetColour(vColor);
+    m_brush.SetColour(*wxWHITE);
-
-    vColor.Set( wxT("WHITE") );
-    m_brush.SetColour(vColor);
 
 } // end of wxDC::wxDC
 
@@ -1708,11 +1705,9 @@ void wxDC::DoDrawText(
     CalcBoundingBox((vX + vWidth), (vY + vHeight));
 } // end of wxDC::DoDrawText
 
-void wxDC::DrawAnyText(
+void wxDC::DrawAnyText( const wxString& rsText,
-  const wxString&                   rsText
+                        wxCoord vX,
-, wxCoord                           vX
+                        wxCoord vY )
-, wxCoord                           vY
-)
 {
     int                             nOldBackground = 0;
     POINTL                          vPtlStart;

src/os2/dcclient.cpp

@@ -168,17 +168,10 @@ void wxWindowDC::InitDC()
     //
     SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID));
 
-    wxColour vColor( wxT("BLACK") );
+    m_pen.SetColour(*wxBLACK);
-    m_pen.SetColour(vColor);
+    m_brush.SetColour(*wxWHITE);
-
-    vColor.Set( wxT("WHITE") );
-    m_brush.SetColour(vColor);
     InitializePalette();
-    wxFont*                         pFont = new wxFont( 10
+    wxFont* pFont = new wxFont( 10, wxMODERN, wxNORMAL, wxBOLD );
-                                                       ,wxMODERN
-                                                       ,wxNORMAL
-                                                       ,wxBOLD
-                                                      );
     SetFont(*pFont);
     delete pFont;
     //

src/os2/radiobox.cpp

@@ -145,11 +145,10 @@ bool wxRadioBox::Create( wxWindow* pParent,
                          const wxValidator& rVal,
                          const wxString& rsName )
 {
-    wxColour vColour;
+    wxColour vColour(*wxBLACK);
     LONG     lColor;
     HWND     hWndParent = GetHwndOf(pParent);
 
-    vColour.Set(wxString(wxT("BLACK")));
     m_backgroundColour = pParent->GetBackgroundColour();
     m_nSelectedButton = -1;
     m_nNoItems = 0;

src/os2/slider.cpp

@@ -406,9 +406,7 @@ bool wxSlider::Create(
                                               )
                                  ) + 4; // for bordersizes
 
-    wxColour                        vColour;
+    wxColour vColour(*wxBLACK);
-
-    vColour.Set(wxString(wxT("BLACK")));
 
     LONG lColor = (LONG)vColour.GetPixel();
 

src/os2/statbox.cpp

@@ -62,9 +62,7 @@ bool wxStaticBox::Create( wxWindow*       pParent,
     //
     SetBackgroundColour(GetParent()->GetBackgroundColour());
 
-    wxColour                        vColour;
+    LONG lColor = (LONG)wxBLACK->GetPixel();
-    vColour.Set(wxString(wxT("BLACK")));
-    LONG                            lColor = (LONG)vColour.GetPixel();
     ::WinSetPresParam( m_hWnd
                       ,PP_FOREGROUNDCOLOR
                       ,sizeof(LONG)