From 136d4499d546b9afdfaf5aea37e42f6ded806790 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 7 Dec 2002 01:07:35 +0000
Subject: [PATCH] minor visual corrections to renderers (patch 649847)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/univ/renderer.cpp     | 4 ----
 src/univ/themes/gtk.cpp   | 4 ++++
 src/univ/themes/win32.cpp | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/univ/renderer.cpp b/src/univ/renderer.cpp
index 0021d3f2f8..bc276a675a 100644
--- a/src/univ/renderer.cpp
+++ b/src/univ/renderer.cpp
@@ -429,10 +429,6 @@ void wxControlRenderer::DrawLabel(const wxBitmap& bitmap,
         if ( bitmap.Ok() )
         {
             rectLabel.Inflate(-marginX, -marginY);
-            
-            // I don't know why this is necessary. RR.
-            rectLabel.x ++;
-            rectLabel.y ++;
         }
 
         wxControl *ctrl = wxStaticCast(m_window, wxControl);
diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp
index 5c4f87e74c..b3a5c59d4a 100644
--- a/src/univ/themes/gtk.cpp
+++ b/src/univ/themes/gtk.cpp
@@ -1610,6 +1610,10 @@ void wxGTKRenderer::DrawRadioButton(wxDC& dc,
         dc.SetBackground(*wxLIGHT_GREY_BRUSH);
         dc.Clear();
         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));
     }
 
diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index d3afd47d7c..085a672638 100644
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -1737,8 +1737,7 @@ void wxWin32Renderer::DrawHalfRect(wxDC& dc, wxRect *rect, const wxPen& pen)
                 rect->GetRight(), rect->GetBottom());
 
     // adjust the rect
-    rect->width--;
-    rect->height--;
+    rect->Inflate(-1);
 }
 
 void wxWin32Renderer::DrawShadedRect(wxDC& dc, wxRect *rect,
-- 
2.45.2