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

minor visual corrections to renderers (patch 649847)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-07 01:07:35 +00:00
parent e622dd68c2
commit 136d4499d5
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/univ/renderer.cpp
View File

@@ -429,10 +429,6 @@ void wxControlRenderer::DrawLabel(const wxBitmap& bitmap,
if ( bitmap.Ok() ) if ( bitmap.Ok() )
{ {
rectLabel.Inflate(-marginX, -marginY); rectLabel.Inflate(-marginX, -marginY);
// I don't know why this is necessary. RR.
rectLabel.x ++;
rectLabel.y ++;
} }
wxControl *ctrl = wxStaticCast(m_window, wxControl); wxControl *ctrl = wxStaticCast(m_window, wxControl);

4
src/univ/themes/gtk.cpp
View File

@@ -1610,6 +1610,10 @@ void wxGTKRenderer::DrawRadioButton(wxDC& dc,
dc.SetBackground(*wxLIGHT_GREY_BRUSH); dc.SetBackground(*wxLIGHT_GREY_BRUSH);
dc.Clear(); dc.Clear();
DrawRadioBitmap(dc, rect, flags); DrawRadioBitmap(dc, rect, flags);
// must unselect the bitmap before setting a mask for it because of the
// MSW limitations
dc.SelectObject(wxNullBitmap);
bitmap.SetMask(new wxMask(bitmap, *wxLIGHT_GREY)); bitmap.SetMask(new wxMask(bitmap, *wxLIGHT_GREY));
} }

3
src/univ/themes/win32.cpp
View File

@@ -1737,8 +1737,7 @@ void wxWin32Renderer::DrawHalfRect(wxDC& dc, wxRect *rect, const wxPen& pen)
rect->GetRight(), rect->GetBottom()); rect->GetRight(), rect->GetBottom());
// adjust the rect // adjust the rect
rect->width--; rect->Inflate(-1);
rect->height--;
} }
void wxWin32Renderer::DrawShadedRect(wxDC& dc, wxRect *rect, void wxWin32Renderer::DrawShadedRect(wxDC& dc, wxRect *rect,