From 9e0a12c958fb6e26fedc61f66166b480cee13a5d Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Tue, 16 Oct 2001 19:05:56 +0000 Subject: [PATCH 1/1] Changed char* to wxChar* in wxColour constructor. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/gdicmn.cpp | 58 ++++++++++++++++++++-------------------- src/generic/tbarsmpl.cpp | 6 ++--- src/generic/treectlg.cpp | 2 +- src/html/m_hline.cpp | 4 +-- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 239278c28e..0145deabfc 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -453,35 +453,35 @@ void wxInitializeStockObjects () wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); - wxRED_PEN = new wxPen ("RED", 1, wxSOLID); - wxCYAN_PEN = new wxPen ("CYAN", 1, wxSOLID); - wxGREEN_PEN = new wxPen ("GREEN", 1, wxSOLID); - wxBLACK_PEN = new wxPen ("BLACK", 1, wxSOLID); - wxWHITE_PEN = new wxPen ("WHITE", 1, wxSOLID); - wxTRANSPARENT_PEN = new wxPen ("BLACK", 1, wxTRANSPARENT); - wxBLACK_DASHED_PEN = new wxPen ("BLACK", 1, wxSHORT_DASH); - wxGREY_PEN = new wxPen ("GREY", 1, wxSOLID); - wxMEDIUM_GREY_PEN = new wxPen ("MEDIUM GREY", 1, wxSOLID); - wxLIGHT_GREY_PEN = new wxPen ("LIGHT GREY", 1, wxSOLID); - - wxBLUE_BRUSH = new wxBrush ("BLUE", wxSOLID); - wxGREEN_BRUSH = new wxBrush ("GREEN", wxSOLID); - wxWHITE_BRUSH = new wxBrush ("WHITE", wxSOLID); - wxBLACK_BRUSH = new wxBrush ("BLACK", wxSOLID); - wxTRANSPARENT_BRUSH = new wxBrush ("BLACK", wxTRANSPARENT); - wxCYAN_BRUSH = new wxBrush ("CYAN", wxSOLID); - wxRED_BRUSH = new wxBrush ("RED", wxSOLID); - wxGREY_BRUSH = new wxBrush ("GREY", wxSOLID); - wxMEDIUM_GREY_BRUSH = new wxBrush ("MEDIUM GREY", wxSOLID); - wxLIGHT_GREY_BRUSH = new wxBrush ("LIGHT GREY", wxSOLID); - - wxBLACK = new wxColour ("BLACK"); - wxWHITE = new wxColour ("WHITE"); - wxRED = new wxColour ("RED"); - wxBLUE = new wxColour ("BLUE"); - wxGREEN = new wxColour ("GREEN"); - wxCYAN = new wxColour ("CYAN"); - wxLIGHT_GREY = new wxColour ("LIGHT GREY"); + wxRED_PEN = new wxPen (wxT("RED"), 1, wxSOLID); + wxCYAN_PEN = new wxPen (wxT("CYAN"), 1, wxSOLID); + wxGREEN_PEN = new wxPen (wxT("GREEN"), 1, wxSOLID); + wxBLACK_PEN = new wxPen (wxT("BLACK"), 1, wxSOLID); + wxWHITE_PEN = new wxPen (wxT("WHITE"), 1, wxSOLID); + wxTRANSPARENT_PEN = new wxPen (wxT("BLACK"), 1, wxTRANSPARENT); + wxBLACK_DASHED_PEN = new wxPen (wxT("BLACK"), 1, wxSHORT_DASH); + wxGREY_PEN = new wxPen (wxT("GREY"), 1, wxSOLID); + wxMEDIUM_GREY_PEN = new wxPen (wxT("MEDIUM GREY"), 1, wxSOLID); + wxLIGHT_GREY_PEN = new wxPen (wxT("LIGHT GREY"), 1, wxSOLID); + + wxBLUE_BRUSH = new wxBrush (wxT("BLUE"), wxSOLID); + wxGREEN_BRUSH = new wxBrush (wxT("GREEN"), wxSOLID); + wxWHITE_BRUSH = new wxBrush (wxT("WHITE"), wxSOLID); + wxBLACK_BRUSH = new wxBrush (wxT("BLACK"), wxSOLID); + wxTRANSPARENT_BRUSH = new wxBrush (wxT("BLACK"), wxTRANSPARENT); + wxCYAN_BRUSH = new wxBrush (wxT("CYAN"), wxSOLID); + wxRED_BRUSH = new wxBrush (wxT("RED"), wxSOLID); + wxGREY_BRUSH = new wxBrush (wxT("GREY"), wxSOLID); + wxMEDIUM_GREY_BRUSH = new wxBrush (wxT("MEDIUM GREY"), wxSOLID); + wxLIGHT_GREY_BRUSH = new wxBrush (wxT("LIGHT GREY"), wxSOLID); + + wxBLACK = new wxColour (wxT("BLACK")); + wxWHITE = new wxColour (wxT("WHITE")); + wxRED = new wxColour (wxT("RED")); + wxBLUE = new wxColour (wxT("BLUE")); + wxGREEN = new wxColour (wxT("GREEN")); + wxCYAN = new wxColour (wxT("CYAN")); + wxLIGHT_GREY = new wxColour (wxT("LIGHT GREY")); wxSTANDARD_CURSOR = new wxCursor (wxCURSOR_ARROW); wxHOURGLASS_CURSOR = new wxCursor (wxCURSOR_WAIT); diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp index 7ddf168ec6..c019f0f43f 100644 --- a/src/generic/tbarsmpl.cpp +++ b/src/generic/tbarsmpl.cpp @@ -509,8 +509,8 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase) PrepareDC(dc); wxPen dark_grey_pen(wxColour( 85,85,85 ), 1, wxSOLID); - wxPen white_pen("WHITE", 1, wxSOLID); - wxPen black_pen("BLACK", 1, wxSOLID); + wxPen white_pen(wxT("WHITE"), 1, wxSOLID); + wxPen black_pen(wxT("BLACK"), 1, wxSOLID); wxBitmap bitmap = tool->GetBitmap(); @@ -612,7 +612,7 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase) wxCoord y = tool->m_y; wxCoord w = bitmap.GetWidth(); wxCoord h = bitmap.GetHeight(); - wxPen thick_black_pen("BLACK", 3, wxSOLID); + wxPen thick_black_pen(wxT("BLACK"), 3, wxSOLID); memDC.SelectObject(bitmap); dc.SetClippingRegion(tool->m_x, tool->m_y, w, h); diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index 34c4ccd440..3176b1eb92 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -664,7 +664,7 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent, SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) ); // m_dottedPen = wxPen( "grey", 0, wxDOT ); too slow under XFree86 - m_dottedPen = wxPen( "grey", 0, 0 ); + m_dottedPen = wxPen( wxT("grey"), 0, 0 ); return TRUE; } diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp index ca4cdd48a3..fa2dba264c 100644 --- a/src/html/m_hline.cpp +++ b/src/html/m_hline.cpp @@ -50,8 +50,8 @@ class wxHtmlLineCell : public wxHtmlCell void wxHtmlLineCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2)) { - wxBrush mybrush("BLACK", wxSOLID); - wxPen mypen("BLACK", 1, wxSOLID); + wxBrush mybrush(wxT("BLACK"), wxSOLID); + wxPen mypen(wxT("BLACK"), 1, wxSOLID); dc.SetBrush(mybrush); dc.SetPen(mypen); dc.DrawRectangle(x + m_PosX, y + m_PosY, m_Width, m_Height); -- 2.47.2