wxMSW: Add support to use generic wxHeaderCtrl in wxMSW port with __WX_FORCE_USE_HEADERCTRL_GENERIC__ macro.

And do respect foreground and background colour set via wxDataViewCtrl::SetHeaderAttr().
Enable dark mode support of the header ctrl.

Author: 徐扬斌

include/wx/headerctrl.h

@@ -250,7 +250,7 @@ class WXDLLIMPEXP_CORE wxHeaderCtrlBase : public wxControl
 //               control, see wxHeaderCtrlSimple for a standalone version
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) && !defined(__WX_FORCE_USE_HEADERCTRL_GENERIC__)
     #include "wx/msw/headerctrl.h"
 #else
     #define wxHAS_GENERIC_HEADERCTRL

src/generic/headerctrlg.cpp

@@ -411,9 +411,16 @@ void wxHeaderCtrl::UpdateReorderingMarker(int xPhysical)
     wxDCOverlay dcover(m_overlay, &dc);
     dcover.Clear();
 
-    dc.SetPen(*wxBLUE);
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
+    static const auto g_light_cyan_pen = wxPen{ wxColour{208, 226, 249} };
+    static const auto g_light_cyan_brush = wxBrush{ wxColour{208, 226, 249} };
+    if (wxSystemSettings::GetAppearance().IsDark()) {
+        dc.SetPen(g_light_cyan_pen);
+        dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    }
+    else {
+        dc.SetPen(*wxBLUE);
+        dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    }
     // draw the phantom position of the column being dragged
     int x = xPhysical - m_dragOffset;
     int y = GetClientSize().y;
@@ -428,7 +435,10 @@ void wxHeaderCtrl::UpdateReorderingMarker(int xPhysical)
     {
         static const int DROP_MARKER_WIDTH = 4;
 
-        dc.SetBrush(*wxBLUE);
+        if (wxSystemSettings::GetAppearance().IsDark())
+            dc.SetBrush(g_light_cyan_brush);
+        else
+            dc.SetBrush(*wxBLUE);
 		if (hover_region == Region::LeftHalf){
             dc.DrawRectangle(GetColStart(col) - DROP_MARKER_WIDTH/2, 0,
                         DROP_MARKER_WIDTH, y);

src/msw/renderer.cpp

@@ -692,25 +692,17 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
     }
 
     wxCHECK_MSG( dc.GetImpl(), -1, wxT("Invalid wxDC") );
-
-    RECT r = ConvertToRECT(dc, rect);
-
-    int state;
-    if ( flags & wxCONTROL_PRESSED )
-        state = HIS_PRESSED;
-    else if ( flags & wxCONTROL_CURRENT )
-        state = HIS_HOT;
-    else
-        state = HIS_NORMAL;
-    ::DrawThemeBackground
-                            (
-                                hTheme,
-                                GetHdcOf(dc.GetTempHDC()),
-                                HP_HEADERITEM,
-                                state,
-                                &r,
-                                NULL
-                            );
+	
+    auto frame_bkg_color = win->GetBackgroundColour();
+    auto bk_brush = wxBrush{ frame_bkg_color };
+    dc.SetBrush(bk_brush);
+    dc.SetPen(*wxTRANSPARENT_PEN);
+    dc.DrawRectangle(rect);
+    dc.SetPen(*wxLIGHT_GREY_PEN);
+    dc.DrawLine(rect.GetLeftTop(), rect.GetLeftBottom());
+	
+    if (params != nullptr)
+        params->m_labelColour = win->GetForegroundColour();
 
     // NOTE: Using the theme to draw HP_HEADERSORTARROW doesn't do anything.
     // Why?  If this can be fixed then draw the sort arrows using the theme