fix deprecated warning

This commit is contained in:
lsv 2024-02-06 08:34:42 +05:00
parent f8b017ad45
commit 2d7ac600c0
25 changed files with 402 additions and 405 deletions

View file

@ -223,22 +223,22 @@ void wxGridCellComboBoxRenderer::Draw(wxGrid &grid, wxGridCellAttr &attr, wxDC &
// Draw 3-d button
wxColour colourBackGround = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
dc.SetBrush(wxBrush(colourBackGround, wxSOLID));
dc.SetPen(wxPen(colourBackGround, 1, wxSOLID));
dc.SetBrush(wxBrush(colourBackGround, wxBRUSHSTYLE_SOLID));
dc.SetPen(wxPen(colourBackGround, 1, wxPENSTYLE_SOLID));
dc.DrawRectangle(rectButton);
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), 1, wxSOLID));
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), 1, wxPENSTYLE_SOLID));
dc.DrawLine(rectButton.GetLeft(), rectButton.GetBottom(),
rectButton.GetRight(), rectButton.GetBottom());
dc.DrawLine(rectButton.GetRight(), rectButton.GetBottom(),
rectButton.GetRight(), rectButton.GetTop() - 1);
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW),
1, wxSOLID));
1, wxPENSTYLE_SOLID));
dc.DrawLine(rectButton.GetLeft() + 1, rectButton.GetBottom() - 1,
rectButton.GetRight() - 1, rectButton.GetBottom() - 1);
dc.DrawLine(rectButton.GetRight() - 1, rectButton.GetBottom() - 1,
rectButton.GetRight() - 1, rectButton.GetTop());
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNHIGHLIGHT),
1, wxSOLID));
1, wxPENSTYLE_SOLID));
dc.DrawLine(rectButton.GetRight() - 2, rectButton.GetTop() + 1,
rectButton.GetLeft() + 1, rectButton.GetTop() + 1);
dc.DrawLine(rectButton.GetLeft() + 1, rectButton.GetTop() + 1,
@ -252,12 +252,12 @@ void wxGridCellComboBoxRenderer::Draw(wxGrid &grid, wxGridCellAttr &attr, wxDC &
rectButton.GetTop() + (rectButton.GetHeight() - nTriHeight) / 2);
point[1] = wxPoint(point[0].x + nTriWidth - 1, point[0].y);
point[2] = wxPoint(point[0].x + 3, point[0].y + nTriHeight - 1);
dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), wxSOLID));
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), 1, wxSOLID));
dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), wxBRUSHSTYLE_SOLID));
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), 1, wxPENSTYLE_SOLID));
dc.DrawPolygon(3, point);
if (m_border == wxLAYOUT_TOP)
{
dc.SetPen(wxPen(*wxBLACK, 1, wxDOT));
dc.SetPen(wxPen(*wxBLACK, 1, wxPENSTYLE_DOT));
dc.DrawLine(rectCell.GetRight(), rectCell.GetTop(),
rectCell.GetLeft(), rectCell.GetTop());
}
@ -300,30 +300,30 @@ void wxGridCellButtonRenderer::Draw(wxGrid &grid, wxGridCellAttr &attr, wxDC &dc
return;
wxColour colourBackGround = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
dc.SetBrush(wxBrush(colourBackGround, wxSOLID));
dc.SetPen(wxPen(colourBackGround, 1, wxSOLID));
dc.SetBrush(wxBrush(colourBackGround, wxBRUSHSTYLE_SOLID));
dc.SetPen(wxPen(colourBackGround, 1, wxPENSTYLE_SOLID));
dc.DrawRectangle(rectButton);
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), 1, wxSOLID));
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), 1, wxPENSTYLE_SOLID));
dc.DrawLine(rectButton.GetLeft(), rectButton.GetBottom(),
rectButton.GetRight(), rectButton.GetBottom());
dc.DrawLine(rectButton.GetRight(), rectButton.GetBottom(),
rectButton.GetRight(), rectButton.GetTop() - 1);
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW),
1, wxSOLID));
1, wxPENSTYLE_SOLID));
dc.DrawLine(rectButton.GetLeft() + 1, rectButton.GetBottom() - 1,
rectButton.GetRight() - 1, rectButton.GetBottom() - 1);
dc.DrawLine(rectButton.GetRight() - 1, rectButton.GetBottom() - 1,
rectButton.GetRight() - 1, rectButton.GetTop());
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNHIGHLIGHT),
1, wxSOLID));
1, wxPENSTYLE_SOLID));
dc.DrawLine(rectButton.GetRight() - 2, rectButton.GetTop() + 1,
rectButton.GetLeft() + 1, rectButton.GetTop() + 1);
dc.DrawLine(rectButton.GetLeft() + 1, rectButton.GetTop() + 1,
rectButton.GetLeft() + 1, rectButton.GetBottom() - 1);
// Draw little plus symbol
dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), wxSOLID));
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), 1, wxSOLID));
dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), wxBRUSHSTYLE_SOLID));
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), 1, wxPENSTYLE_SOLID));
int nPlusWidth = 7;
int nPlusHeight = 7;
wxPoint point[4];
@ -336,7 +336,7 @@ void wxGridCellButtonRenderer::Draw(wxGrid &grid, wxGridCellAttr &attr, wxDC &dc
if (m_border == wxLAYOUT_TOP)
{
dc.SetPen(wxPen(*wxBLACK, 1, wxDOT));
dc.SetPen(wxPen(*wxBLACK, 1, wxPENSTYLE_DOT));
dc.DrawLine(rectCell.GetRight(), rectCell.GetTop(),
rectCell.GetLeft(), rectCell.GetTop());
}