From 19bc15143af345787753717e2a1b22a29e339469 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 7 Jun 2006 13:26:00 +0000 Subject: [PATCH] wxBLACK usage. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- demos/forty/card.cpp | 2 +- demos/forty/forty.cpp | 2 +- samples/dialogs/dialogs.cpp | 2 +- samples/image/image.cpp | 8 ++++---- src/os2/dc.cpp | 17 ++++++----------- src/os2/dcclient.cpp | 13 +++---------- src/os2/radiobox.cpp | 3 +-- src/os2/slider.cpp | 6 ++---- src/os2/statbox.cpp | 4 +--- 9 files changed, 20 insertions(+), 37 deletions(-) diff --git a/demos/forty/card.cpp b/demos/forty/card.cpp index 7f126fdafa..44a0f65d4b 100644 --- a/demos/forty/card.cpp +++ b/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); diff --git a/demos/forty/forty.cpp b/demos/forty/forty.cpp index 7df7acf9a6..5e3525e256 100644 --- a/demos/forty/forty.cpp +++ b/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; diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 7899fbf30d..deb7511658 100644 --- a/samples/dialogs/dialogs.cpp +++ b/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 diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 85358943f9..05912b5e49 100644 --- a/samples/image/image.cpp +++ b/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 diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp index 86e618a0f4..8cb0816fa6 100644 --- a/src/os2/dc.cpp +++ b/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(vColor); - - vColor.Set( wxT("WHITE") ); - m_brush.SetColour(vColor); + m_pen.SetColour(*wxBLACK); + m_brush.SetColour(*wxWHITE); } // end of wxDC::wxDC @@ -1708,11 +1705,9 @@ void wxDC::DoDrawText( CalcBoundingBox((vX + vWidth), (vY + vHeight)); } // end of wxDC::DoDrawText -void wxDC::DrawAnyText( - const wxString& rsText -, wxCoord vX -, wxCoord vY -) +void wxDC::DrawAnyText( const wxString& rsText, + wxCoord vX, + wxCoord vY ) { int nOldBackground = 0; POINTL vPtlStart; @@ -1776,7 +1771,7 @@ void wxDC::DrawAnyText( vPtlStart.y = vY; } - PCH pzStr = (PCH)rsText.c_str(); + PCH pzStr = (PCH)rsText.c_str(); ::GpiMove(m_hPS, &vPtlStart); lHits = ::GpiCharString( m_hPS diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp index 2100b16925..b811e9a8df 100644 --- a/src/os2/dcclient.cpp +++ b/src/os2/dcclient.cpp @@ -168,17 +168,10 @@ void wxWindowDC::InitDC() // SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID)); - wxColour vColor( wxT("BLACK") ); - m_pen.SetColour(vColor); - - vColor.Set( wxT("WHITE") ); - m_brush.SetColour(vColor); + m_pen.SetColour(*wxBLACK); + m_brush.SetColour(*wxWHITE); InitializePalette(); - wxFont* pFont = new wxFont( 10 - ,wxMODERN - ,wxNORMAL - ,wxBOLD - ); + wxFont* pFont = new wxFont( 10, wxMODERN, wxNORMAL, wxBOLD ); SetFont(*pFont); delete pFont; // diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp index c65677b170..3632ef191b 100644 --- a/src/os2/radiobox.cpp +++ b/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; diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp index ae0c5c1520..eec25e5f92 100644 --- a/src/os2/slider.cpp +++ b/src/os2/slider.cpp @@ -406,11 +406,9 @@ bool wxSlider::Create( ) ) + 4; // for bordersizes - wxColour vColour; + wxColour vColour(*wxBLACK); - vColour.Set(wxString(wxT("BLACK"))); - - LONG lColor = (LONG)vColour.GetPixel(); + LONG lColor = (LONG)vColour.GetPixel(); ::WinSetPresParam( m_hStaticMin ,PP_FOREGROUNDCOLOR diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp index 41f25791f4..8ae9f4d7ab 100644 --- a/src/os2/statbox.cpp +++ b/src/os2/statbox.cpp @@ -62,9 +62,7 @@ bool wxStaticBox::Create( wxWindow* pParent, // SetBackgroundColour(GetParent()->GetBackgroundColour()); - wxColour vColour; - vColour.Set(wxString(wxT("BLACK"))); - LONG lColor = (LONG)vColour.GetPixel(); + LONG lColor = (LONG)wxBLACK->GetPixel(); ::WinSetPresParam( m_hWnd ,PP_FOREGROUNDCOLOR ,sizeof(LONG) -- 2.45.2