Reverted part of rev 1.92. It causes probelms on Windows when

[wxWidgets.git] / src / generic / renderg.cpp

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index b1b8fc76c4b76fdc92b48bae7a4b0d856adac156..138321f6bfb3fbdcb52bd7f825b8bb34dd9e83d0 100644 (file)
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -29,11 +29,10 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/dc.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/dc.h"

+    #include "wx/settings.h"
+    #include "wx/gdicmn.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/gdicmn.h"
-
-#include "wx/settings.h"

 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 #include "wx/module.h"
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 #include "wx/module.h"


@@ -232,12 +231,8 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win),
                                       int flags)
 {
     // store settings
                                       int flags)
 {
     // store settings

-    wxDCPenChanger penChanger(dc);
-    wxDCBrushChanger brushChanger(dc);
-
-    // white background
-    penChanger.Set(*wxGREY_PEN);
-    brushChanger.Set(*wxWHITE_BRUSH);
+    wxDCPenChanger penChanger(dc, *wxGREY_PEN);
+    wxDCBrushChanger brushChanger(dc, *wxWHITE_BRUSH);

 
     dc.DrawRectangle(rect);
 
 
     dc.DrawRectangle(rect);