don't always erase the background ourselves as this is incompatible with XP themed...

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index d582c1b9413c5b4dddc3dc198332e3ed3ffa445c..56d65c055b377bfc0716c216917c84ad6efa7501 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -165,7 +165,6 @@ public:
     // event handlers
     // --------------
 
     // event handlers
     // --------------
 

-    void OnEraseBackground(wxEraseEvent& event);

     void OnPaint(wxPaintEvent& event);
 #ifdef __WXWINCE__
     void OnInitDialog( wxInitDialogEvent& event );
     void OnPaint(wxPaintEvent& event);
 #ifdef __WXWINCE__
     void OnInitDialog( wxInitDialogEvent& event );

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index f5a6693112e04170f62d708ebc75d3d64e837c29..8c7b93ca6286f2ee435d5c3ab4b0d520198a848c 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -332,7 +332,6 @@ wxCONSTRUCTOR_DUMMY(wxWindow)
 #endif // __WXUNIVERSAL__/__WXMSW__
 
 BEGIN_EVENT_TABLE(wxWindowMSW, wxWindowBase)
 #endif // __WXUNIVERSAL__/__WXMSW__
 
 BEGIN_EVENT_TABLE(wxWindowMSW, wxWindowBase)

-    EVT_ERASE_BACKGROUND(wxWindowMSW::OnEraseBackground)

     EVT_SYS_COLOUR_CHANGED(wxWindowMSW::OnSysColourChanged)
 #ifdef __WXWINCE__
     EVT_INIT_DIALOG(wxWindowMSW::OnInitDialog)
     EVT_SYS_COLOUR_CHANGED(wxWindowMSW::OnSysColourChanged)
 #ifdef __WXWINCE__
     EVT_INIT_DIALOG(wxWindowMSW::OnInitDialog)


@@ -4050,29 +4049,6 @@ bool wxWindowMSW::HandleEraseBkgnd(WXHDC hdc)
     if ( ::IsIconic(GetHwnd()) )
         return true;
 
     if ( ::IsIconic(GetHwnd()) )
         return true;
 

-#if 0
-    if (GetParent() && GetParent()->GetExtraStyle() & wxWS_EX_THEMED_BACKGROUND)
-    {
-        return false;
-    }
-
-    if (GetExtraStyle() & wxWS_EX_THEMED_BACKGROUND)
-    {
-        if (wxUxThemeEngine::Get())
-        {
-            WXHTHEME hTheme = wxUxThemeEngine::Get()->m_pfnOpenThemeData(GetHWND(), L"TAB");
-            if (hTheme)
-            {
-                WXURECT rect;
-                ::GetClientRect((HWND) GetHWND(), (RECT*) & rect);
-                wxUxThemeEngine::Get()->m_pfnDrawThemeBackground(hTheme, hdc, 10 /* TABP_BODY */, 0, &rect, &rect);
-                wxUxThemeEngine::Get()->m_pfnCloseThemeData(hTheme);
-                return true;
-            }
-        }
-    }
-#endif
-

     wxDCTemp dc(hdc);
 
     dc.SetHDC(hdc);
     wxDCTemp dc(hdc);
 
     dc.SetHDC(hdc);


@@ -4091,33 +4067,6 @@ bool wxWindowMSW::HandleEraseBkgnd(WXHDC hdc)
     return rc;
 }
 
     return rc;
 }
 

-void wxWindowMSW::OnEraseBackground(wxEraseEvent& event)
-{
-    RECT rect;
-    ::GetClientRect(GetHwnd(), &rect);
-
-    wxColour backgroundColour( GetBackgroundColour());
-    COLORREF ref = PALETTERGB(backgroundColour.Red(),
-                              backgroundColour.Green(),
-                              backgroundColour.Blue());
-    HBRUSH hBrush = ::CreateSolidBrush(ref);
-    if ( !hBrush )
-        wxLogLastError(wxT("CreateSolidBrush"));
-
-    HDC hdc = (HDC)event.GetDC()->GetHDC();
-
-#ifndef __WXWINCE__
-    int mode = ::SetMapMode(hdc, MM_TEXT);
-#endif
-
-    ::FillRect(hdc, &rect, hBrush);
-    ::DeleteObject(hBrush);
-
-#ifndef __WXWINCE__
-    ::SetMapMode(hdc, mode);
-#endif
-}
-

 // ---------------------------------------------------------------------------
 // moving and resizing
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // moving and resizing
 // ---------------------------------------------------------------------------