Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed char* to wxChar* in wxColour constructor.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2001-10-16 19:05:56 +00:00
parent de448406da
commit 9e0a12c958
4 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/common/gdicmn.cpp
View File

@@ -453,35 +453,35 @@ void wxInitializeStockObjects ()
wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL);
wxRED_PEN = new wxPen ("RED", 1, wxSOLID); wxRED_PEN = new wxPen (wxT("RED"), 1, wxSOLID);
wxCYAN_PEN = new wxPen ("CYAN", 1, wxSOLID); wxCYAN_PEN = new wxPen (wxT("CYAN"), 1, wxSOLID);
wxGREEN_PEN = new wxPen ("GREEN", 1, wxSOLID); wxGREEN_PEN = new wxPen (wxT("GREEN"), 1, wxSOLID);
wxBLACK_PEN = new wxPen ("BLACK", 1, wxSOLID); wxBLACK_PEN = new wxPen (wxT("BLACK"), 1, wxSOLID);
wxWHITE_PEN = new wxPen ("WHITE", 1, wxSOLID); wxWHITE_PEN = new wxPen (wxT("WHITE"), 1, wxSOLID);
wxTRANSPARENT_PEN = new wxPen ("BLACK", 1, wxTRANSPARENT); wxTRANSPARENT_PEN = new wxPen (wxT("BLACK"), 1, wxTRANSPARENT);
wxBLACK_DASHED_PEN = new wxPen ("BLACK", 1, wxSHORT_DASH); wxBLACK_DASHED_PEN = new wxPen (wxT("BLACK"), 1, wxSHORT_DASH);
wxGREY_PEN = new wxPen ("GREY", 1, wxSOLID); wxGREY_PEN = new wxPen (wxT("GREY"), 1, wxSOLID);
wxMEDIUM_GREY_PEN = new wxPen ("MEDIUM GREY", 1, wxSOLID); wxMEDIUM_GREY_PEN = new wxPen (wxT("MEDIUM GREY"), 1, wxSOLID);
wxLIGHT_GREY_PEN = new wxPen ("LIGHT GREY", 1, wxSOLID); wxLIGHT_GREY_PEN = new wxPen (wxT("LIGHT GREY"), 1, wxSOLID);
wxBLUE_BRUSH = new wxBrush ("BLUE", wxSOLID); wxBLUE_BRUSH = new wxBrush (wxT("BLUE"), wxSOLID);
wxGREEN_BRUSH = new wxBrush ("GREEN", wxSOLID); wxGREEN_BRUSH = new wxBrush (wxT("GREEN"), wxSOLID);
wxWHITE_BRUSH = new wxBrush ("WHITE", wxSOLID); wxWHITE_BRUSH = new wxBrush (wxT("WHITE"), wxSOLID);
wxBLACK_BRUSH = new wxBrush ("BLACK", wxSOLID); wxBLACK_BRUSH = new wxBrush (wxT("BLACK"), wxSOLID);
wxTRANSPARENT_BRUSH = new wxBrush ("BLACK", wxTRANSPARENT); wxTRANSPARENT_BRUSH = new wxBrush (wxT("BLACK"), wxTRANSPARENT);
wxCYAN_BRUSH = new wxBrush ("CYAN", wxSOLID); wxCYAN_BRUSH = new wxBrush (wxT("CYAN"), wxSOLID);
wxRED_BRUSH = new wxBrush ("RED", wxSOLID); wxRED_BRUSH = new wxBrush (wxT("RED"), wxSOLID);
wxGREY_BRUSH = new wxBrush ("GREY", wxSOLID); wxGREY_BRUSH = new wxBrush (wxT("GREY"), wxSOLID);
wxMEDIUM_GREY_BRUSH = new wxBrush ("MEDIUM GREY", wxSOLID); wxMEDIUM_GREY_BRUSH = new wxBrush (wxT("MEDIUM GREY"), wxSOLID);
wxLIGHT_GREY_BRUSH = new wxBrush ("LIGHT GREY", wxSOLID); wxLIGHT_GREY_BRUSH = new wxBrush (wxT("LIGHT GREY"), wxSOLID);
wxBLACK = new wxColour ("BLACK"); wxBLACK = new wxColour (wxT("BLACK"));
wxWHITE = new wxColour ("WHITE"); wxWHITE = new wxColour (wxT("WHITE"));
wxRED = new wxColour ("RED"); wxRED = new wxColour (wxT("RED"));
wxBLUE = new wxColour ("BLUE"); wxBLUE = new wxColour (wxT("BLUE"));
wxGREEN = new wxColour ("GREEN"); wxGREEN = new wxColour (wxT("GREEN"));
wxCYAN = new wxColour ("CYAN"); wxCYAN = new wxColour (wxT("CYAN"));
wxLIGHT_GREY = new wxColour ("LIGHT GREY"); wxLIGHT_GREY = new wxColour (wxT("LIGHT GREY"));
wxSTANDARD_CURSOR = new wxCursor (wxCURSOR_ARROW); wxSTANDARD_CURSOR = new wxCursor (wxCURSOR_ARROW);
wxHOURGLASS_CURSOR = new wxCursor (wxCURSOR_WAIT); wxHOURGLASS_CURSOR = new wxCursor (wxCURSOR_WAIT);

6
src/generic/tbarsmpl.cpp
View File

@@ -509,8 +509,8 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase)
PrepareDC(dc); PrepareDC(dc);
wxPen dark_grey_pen(wxColour( 85,85,85 ), 1, wxSOLID); wxPen dark_grey_pen(wxColour( 85,85,85 ), 1, wxSOLID);
wxPen white_pen("WHITE", 1, wxSOLID); wxPen white_pen(wxT("WHITE"), 1, wxSOLID);
wxPen black_pen("BLACK", 1, wxSOLID); wxPen black_pen(wxT("BLACK"), 1, wxSOLID);
wxBitmap bitmap = tool->GetBitmap(); wxBitmap bitmap = tool->GetBitmap();
@@ -612,7 +612,7 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase)
wxCoord y = tool->m_y; wxCoord y = tool->m_y;
wxCoord w = bitmap.GetWidth(); wxCoord w = bitmap.GetWidth();
wxCoord h = bitmap.GetHeight(); wxCoord h = bitmap.GetHeight();
wxPen thick_black_pen("BLACK", 3, wxSOLID); wxPen thick_black_pen(wxT("BLACK"), 3, wxSOLID);
memDC.SelectObject(bitmap); memDC.SelectObject(bitmap);
dc.SetClippingRegion(tool->m_x, tool->m_y, w, h); dc.SetClippingRegion(tool->m_x, tool->m_y, w, h);

2
src/generic/treectlg.cpp
View File

@@ -664,7 +664,7 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent,
SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) ); SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
// m_dottedPen = wxPen( "grey", 0, wxDOT ); too slow under XFree86 // 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; return TRUE;
} }

4
src/html/m_hline.cpp
View File

@@ -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)) void wxHtmlLineCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2))
{ {
wxBrush mybrush("BLACK", wxSOLID); wxBrush mybrush(wxT("BLACK"), wxSOLID);
wxPen mypen("BLACK", 1, wxSOLID); wxPen mypen(wxT("BLACK"), 1, wxSOLID);
dc.SetBrush(mybrush); dc.SetBrush(mybrush);
dc.SetPen(mypen); dc.SetPen(mypen);
dc.DrawRectangle(x + m_PosX, y + m_PosY, m_Width, m_Height); dc.DrawRectangle(x + m_PosX, y + m_PosY, m_Width, m_Height);