more GTK-ish toolbar drawing

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp
index 6bacb6303d838448a411b80282c7ddd82e61cc4b..2777539251e82600b3203a7f804678c011e4bca4 100644 (file)
--- a/src/univ/themes/gtk.cpp
+++ b/src/univ/themes/gtk.cpp
@@ -1582,11 +1582,15 @@ void wxGTKRenderer::DrawToolBarButton(wxDC& dc,
 
         if ( flags & wxCONTROL_PRESSED )
         {
 
         if ( flags & wxCONTROL_PRESSED )
         {

-            DrawBorder(dc, wxBORDER_SUNKEN, rect, flags);
+            DrawBorder(dc, wxBORDER_SUNKEN, rect, flags, &rect);
+
+            DrawBackground(dc, wxSCHEME_COLOUR(m_scheme, CONTROL_PRESSED), rect);

         }
         else if ( flags & wxCONTROL_CURRENT )
         {
         }
         else if ( flags & wxCONTROL_CURRENT )
         {

-            DrawBorder(dc, wxBORDER_RAISED, rect, flags);
+            DrawBorder(dc, wxBORDER_RAISED, rect, flags, &rect);
+
+            DrawBackground(dc, wxSCHEME_COLOUR(m_scheme, CONTROL_CURRENT), rect);

         }
 
         dc.DrawLabel(label, bitmap, rect, wxALIGN_CENTRE);
         }
 
         dc.DrawLabel(label, bitmap, rect, wxALIGN_CENTRE);