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

Replace wxDeprecatedGUIConstants enum values

Browse Source
This commit is contained in:
Maarten Bent
2018-11-25 20:22:35 +01:00
parent 86c49283f5
commit 39ff5b90e5
81 changed files with 257 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/univ/ctrlrend.cpp
View File

@@ -68,7 +68,7 @@ wxControlRenderer::wxControlRenderer(wxWindow *window,
void wxControlRenderer::DrawLabel()
{
m_dc.SetBackgroundMode(wxTRANSPARENT);
m_dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
m_dc.SetFont(m_window->GetFont());
m_dc.SetTextForeground(m_window->GetForegroundColour());
@@ -89,7 +89,7 @@ void wxControlRenderer::DrawLabel()
void wxControlRenderer::DrawButtonLabel(const wxBitmap& bitmap,
wxCoord marginX, wxCoord marginY)
{
m_dc.SetBackgroundMode(wxTRANSPARENT);
m_dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
m_dc.SetFont(m_window->GetFont());
m_dc.SetTextForeground(m_window->GetForegroundColour());

2
src/univ/notebook.cpp
View File

@@ -475,7 +475,7 @@ void wxNotebook::DoDrawTab(wxDC& dc, const wxRect& rect, size_t n)
bmp.Create(w, h);
wxMemoryDC dc;
dc.SelectObject(bmp);
dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
dc.SetBackground(wxBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID));
GetImageList()->Draw(image, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL, true);
dc.SelectObject(wxNullBitmap);
#else

6
src/univ/stdrend.cpp
View File

@@ -199,7 +199,7 @@ void wxStdRenderer::DrawButtonSurface(wxDC& dc,
void
wxStdRenderer::DrawFocusRect(wxWindow* WXUNUSED(win), wxDC& dc, const wxRect& rect, int WXUNUSED(flags))
{
// draw the pixels manually because the "dots" in wxPen with wxDOT style
// draw the pixels manually because the "dots" in wxPen with wxPENSTYLE_DOT style
// may be short traits and not really dots
//
// note that to behave in the same manner as DrawRect(), we must exclude
@@ -774,13 +774,13 @@ void wxStdRenderer::DrawTextLine(wxDC& dc,
colBg = dc.GetTextBackground();
dc.SetTextForeground(wxSCHEME_COLOUR(m_scheme, HIGHLIGHT_TEXT));
dc.SetTextBackground(wxSCHEME_COLOUR(m_scheme, HIGHLIGHT));
dc.SetBackgroundMode(wxSOLID);
dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID);
dc.DrawText(s, x, rect.y);
dc.GetTextExtent(s, &width, NULL);
x += width;
dc.SetBackgroundMode(wxTRANSPARENT);
dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
dc.SetTextBackground(colBg);
dc.SetTextForeground(colFg);
}

2
src/univ/themes/mono.cpp
View File

@@ -1060,7 +1060,7 @@ void wxMonoRenderer::DrawScrollbarThumb(wxDC& dc,
{
DrawSolidRect(dc, wxMONO_BG_COL, rect);
// manually draw stipple pattern (wxDFB doesn't implement the wxSTIPPLE
// manually draw stipple pattern (wxDFB doesn't implement the wxBRUSHSTYLE_STIPPLE
// brush style):
dc.SetPen(m_penFg);
for ( wxCoord y = rect.GetTop(); y <= rect.GetBottom(); y++ )