Groups

[Git][wxwidgets/wxwidgets][master] 17 commits: Revert "Restore the use of WS_EX_COMPOSITED by default"

2 views

Skip to first unread message

Vadim Zeitlin (@_VZ_)

unread,

Sep 23, 2025, 10:17:28 AMSep 23

to wx-commi...@googlegroups.com

Vadim Zeitlin pushed to branch master at wxWidgets / wxWidgets

Commits:

4a8a4f56

by Vadim Zeitlin at 2025-09-18T01:17:53+02:00

Revert "Restore the use of WS_EX_COMPOSITED by default"

This reverts commit ccaf5728f66ac0710c2deaa0ce0def14bf1b11cb.

2d487423

by Vadim Zeitlin at 2025-09-18T01:18:04+02:00

Revert "Disable use of composition for top most windows"

This reverts commit b4dd25ee3f6033126030821d7e8d30d4076d23ac.

3152ac4e

by Vadim Zeitlin at 2025-09-18T13:53:04+02:00

Revert "Fix wxStaticBox drawing after disabling composition for parent"

This reverts commit 6f5703a885067464e1d4f5649f9b8eaf0e465304.

166133d4

by Vadim Zeitlin at 2025-09-18T13:53:05+02:00

Revert "Force wxFULL_REPAINT_ON_RESIZE for windows using WS_EX_COMPOSITED"

This reverts commit a4ebfbb7739dfee8cf4d3d90c64417afd4de8720.

5d63c764

by Vadim Zeitlin at 2025-09-18T13:53:05+02:00

Revert "Don't try to clear WS_EX_COMPOSITED for TLWs"

This reverts commit 3259d1e2d949e4d155fe4adeba834bd73458f048.

4f994199

by Vadim Zeitlin at 2025-09-18T13:53:05+02:00

Revert "Add msw.window.no-composited system option"

This reverts commit d9734baed562794858228bedf2df4e91aa2f9ca3.

08f62de2

by Vadim Zeitlin at 2025-09-18T13:53:05+02:00

Revert "Document WS_EX_COMPOSITED impact on wxClientDC"

This reverts commit b0ed71658dd4ec39094e1ff2990d0e6bc88311b6.

b21df122

by Vadim Zeitlin at 2025-09-18T13:53:05+02:00

Revert "Disable use of composition in forty demo under MSW"

This reverts commit 3a7394fe088dc65e244355a17406aea93c74017d.

6073ac7d

by Vadim Zeitlin at 2025-09-18T13:53:05+02:00

Revert "Disable compositing when using wxDragImage"

This reverts commit 9261816febbbaf089842578bc4f6f2c81c472c31.

56bd4a62

by Vadim Zeitlin at 2025-09-18T13:53:05+02:00

Revert "Enable double buffering for all generic windows in wxMSW"

This reverts commit cd15602378a83f1c05deb930c7a4243a0ace289e.

9ee71a7c

by Vadim Zeitlin at 2025-09-18T13:53:05+02:00

Revert "samples/mfc:  disable composition to allow wxClientDC to work"

This reverts commit 6ab144f9bf2c329e8d105e7461f8d2d48c6cb7a6.

c128e881

by Vadim Zeitlin at 2025-09-18T13:53:05+02:00

Remove now unnecessary calls to MSWDisableComposited()

Still keep the function itself for compatibility and because it might
conceivably be still helpful e.g. after calling SetDoubleBuffered().

bd668fd0

by Vadim Zeitlin at 2025-09-18T13:53:05+02:00

Reset wxALWAYS_NATIVE_DOUBLE_BUFFER to 0 for wxMSW

This reverts fcc7430610ca202b744df75dc3d7e471a1e8b8a4.

ad90b172

by Vadim Zeitlin at 2025-09-18T13:53:05+02:00

Revert "Fix wxDateTimePickerCtrl arrows redrawing with WS_EX_COMPOSITED"

This reverts commit ed7f5a671cd055f63e310daa5e76efb07ac63e7c.

f2a068d9

by Vadim Zeitlin at 2025-09-18T13:53:05+02:00

Don't draw wxSpinButton manually in light mode

This was only necessary when using WS_EX_COMPOSITED which is not used
any more.

This reverts 79567c83f4263df2860b0c4da38d91da834c1aab.

cc6fed97

by Vadim Zeitlin at 2025-09-23T15:36:38+02:00

Fix compilation error in non-wxQt ports in wxSlider tests

Fix error in the last commit and also emit a warning when using Qt 6.8.

b5a9fa38

by Vadim Zeitlin at 2025-09-23T15:38:11+02:00

Merge branch 'msw-drop-compositing'

Don't enable WS_EX_COMPOSITED by default in wxMSW any longer.

Closes #25025.

Closes #25797.

See #25808.

21 changed files:

demos/forty/canvas.cpp
docs/changes.txt
include/wx/dcbuffer.h
include/wx/msw/statbox.h
include/wx/msw/window.h
interface/wx/dcclient.h
interface/wx/statbox.h
interface/wx/sysopt.h
interface/wx/window.h
samples/mfc/mfctest.cpp
src/common/sizer.cpp
src/common/webview_chromium.cpp
src/msw/datetimectrl.cpp
src/msw/dragimag.cpp
src/msw/glcanvas.cpp
src/msw/listctrl.cpp
src/msw/spinbutt.cpp
src/msw/statbox.cpp
src/msw/webview_edge.cpp
src/msw/window.cpp
tests/controls/slidertest.cpp

Changes:

demos/forty/canvas.cpp


              m_playerDialog(0),
              m_leftBtnDown(false)
 {
-#ifdef __WXMSW__
-    // Unfortunately the redraw logic here is incompatible with double
-    // buffering under MSW, so we have to disable it. The proper solution would
-    // be to rewrite this logic, as this is also required to make it work under
-    // GTK/Wayland and macOS, where the game currently doesn't update its
-    // display at all.
-    MSWDisableComposited();
-#endif
-
     SetScrollbars(0, 0, 0, 0);
 
 #ifdef __WXGTK__

docs/changes.txt


 Changes in behaviour not resulting in compilation errors
 --------------------------------------------------------
 
-- wxMSW now uses double buffering by default, meaning that updating the
-  windows using wxClientDC doesn't work any longer, which is consistent with
-  the behaviour of wxGTK with Wayland backend and of wxOSX, but not with the
-  traditional historic behaviour of wxMSW (or wxGTK/X11). You may call
-  MSWDisableComposited() to restore the previous behaviour, however it is
-  strongly recommended to change your redrawing logic to avoid using wxClientDC
-  instead, as the code using it still won't work with wxGTK/wxOSX.
-
-  You may also choose to globally set the new msw.window.no-composited system
-  option to disable the use of double buffering, but please consider doing it
-  only as a last resort and/or temporary solution, as this _will_ result in
-  flicker and won't be supported at all in the future wxWidgets versions.
-
 - wxMSW doesn't support versions of Microsoft Windows before Windows 7. If you
   need Windows XP or Vista support, please use wxWidgets 3.2.
 

include/wx/dcbuffer.h


 #include "wx/dcclient.h"
 #include "wx/window.h"
 
-// All current ports use double buffering.
-#define wxALWAYS_NATIVE_DOUBLE_BUFFER       1
-
+// Only wxMSW doesn't use double buffering.
+#ifdef __WXMSW__
+    #define wxALWAYS_NATIVE_DOUBLE_BUFFER       0
+#else
+    #define wxALWAYS_NATIVE_DOUBLE_BUFFER       1
+#endif
 
 // ----------------------------------------------------------------------------
 // Double buffering helper.

include/wx/msw/statbox.h


     // returns true if the platform should explicitly apply a theme border
     virtual bool CanApplyThemeBorder() const override { return false; }
 
-    virtual void MSWOnDisabledComposited() override;
-
 protected:
     virtual wxSize DoGetBestSize() const override;
 

include/wx/msw/window.h


     virtual bool IsDoubleBuffered() const override;
 
     // Ensure that neither this window itself nor any of its parents use
-    // WS_EX_COMPOSITED: this is used by the native wxListCtrl which is
-    // incompatible with this style.
+    // WS_EX_COMPOSITED: this may only be necessary after calling
+    // SetDoubleBuffered() which sets this style.
     void MSWDisableComposited();
 
-    // This function is called for all child windows when compositing is
-    // disabled for their parent.
-    virtual void MSWOnDisabledComposited() { }
-
     // synthesize a wxEVT_LEAVE_WINDOW event and set m_mouseInWindow to false
     void GenerateMouseLeave();
 

interface/wx/dcclient.h


 
     @note While wxClientDC may also be used for drawing on the client area of a
     window from outside an EVT_PAINT() handler in some ports, this does @em not
-    work on most of the platforms: neither wxOSX nor wxGTK with GTK 3 Wayland
-    backend support this at all, so drawing using wxClientDC simply doesn't
-    have any effect there. CanBeUsedForDrawing() can be used to determine
-    whether wxClientDC can be used for drawing in the current environment, but
-    it is recommended to only draw on the window using wxPaintDC, as this is
+    work on all platforms: neither wxOSX nor wxGTK with GTK 3 Wayland backend
+    support this at all, so drawing using wxClientDC simply doesn't have any
+    effect there. CanBeUsedForDrawing() can be used to determine whether
+    wxClientDC can be used for drawing in the current environment, but it is
+    recommended to only draw on the window using wxPaintDC, as this is
     guaranteed to work everywhere. To redraw a small part of the window, use
     wxWindow::RefreshRect() to invalidate just this part and check
     wxWindow::GetUpdateRegion() in the paint event handler to redraw this part

interface/wx/statbox.h


     wxWidgets 2.9.1 it is strongly recommended to create them as children of
     wxStaticBox itself, as doing this avoids problems with repainting that
     could happen when creating the other windows as siblings of the box.
-    Notably, in wxMSW, siblings of the static box are not drawn at all inside
-    it when compositing is used, which is the case by default, and
-    wxWindow::MSWDisableComposited() must be explicitly called to fix this.
-    Creating windows located inside the static box as its children avoids this
-    problem and works well whether compositing is used or not.
 
-    To summarize, the correct way to create static box and the controls inside
+    To be clear, the correct way to create static box and the controls inside
     it is:
     @code
         void MyFrame::CreateControls()

interface/wx/sysopt.h


         appearance but not all fonts are available in this quality,
         e.g. the Terminal font in small sizes is not and this option may be
         used if wider fonts selection is more important than higher quality.
-    @flag{msw.window.no-composited}
-        If set to 1, disables the use of composited, i.e. double-buffered,
-        windows by default in wxMSW. This is not recommended, but can be useful
-        for debugging or working around redraw problems in the existing code.
     @flag{msw.dark-mode}
         If set to 1, enable experimental support of dark mode if the system is
         using it, i.e. this has the same effect as calling

interface/wx/window.h


     ///@}
 
 
-    /**
-        Disable the use native double buffering in wxMSW.
-
-        This MSW-specific function can be used to disable the use of
-        `WS_EX_COMPOSITED` for this window and all of its parents and so allow
-        using wxClientDC with it.
-
-        `WS_EX_COMPOSITED` style is turned on by default when creating the
-        windows and it is strongly recommended @e not to use this functions to
-        remove it, but to instead change the drawing code to avoid using
-        wxClientDC.
-
-        If you do need to use it, please note that this function doesn't exist
-        in the other ports and has to be explicitly bracketed by the checks for
-        wxMSW, e.g.
-        @code
-        MyFrame::MyFrame(...)
-        {
-            auto p = new wxPanel(this);
-        #ifdef __WXMSW__
-            p->MSWDisableComposited();
-        #endif
-
-            // Using wxClientDC will work now with this panel in wxMSW --
-            // although it still won't with wxOSX nor wxGTK under Wayland.
-        }
-        @endcode
-
-        @see wxClientDC
-
-        @since 3.3.0
-     */
-    void MSWDisableComposited();
 
 protected:
 

samples/mfc/mfctest.cpp


 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
         : wxScrolledWindow(parent, -1, pos, size)
 {
-    MSWDisableComposited();
 }
 
 // Define the repainting behaviour

src/common/sizer.cpp


                wxDumpWindow(win),
                wxDumpWindow(win->GetParent()));
 
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    // Additionally, under MSW the windows inside a static box are not
-    // drawn at all when compositing is used, so we have to disable it.
-    //
-    // An alternative could be to Reparent() the window to the static
-    // box, but it might break the existing code and as we only allow
-    // this for compatibility in the first place, it seems better not
-    // to risk it.
-    win->MSWDisableComposited();
-#endif // __WXMSW__ && !__WXUNIVERSAL__
-
     return true;
 }
 

src/common/webview_chromium.cpp


     if ( !InitCEF(m_implData->m_config) )
         return false;
 
-#ifdef __WXMSW__
-    MSWDisableComposited();
-#endif // __WXMSW__
-
     m_clientHandler = new ClientHandler{*this};
     m_clientHandler->AddRef();
 

src/msw/datetimectrl.cpp


 // wxDateTimePickerCtrl implementation
 // ============================================================================
 
-namespace wxMSWImpl
-{
-
-LRESULT CALLBACK
-DateTimeUDProc(HWND hwnd, UINT nMsg, WPARAM wParam, LPARAM lParam,
-               UINT_PTR uIdSubclass, DWORD_PTR WXUNUSED(dwRefData))
-{
-    switch ( nMsg )
-    {
-        case WM_PAINT:
-            // This is a bit ridiculous, but we have to explicitly paint the
-            // control here, even if all we do is to let it draw itself,
-            // because without this it may not draw the lower arrow at all when
-            // using WS_EX_COMPOSITED (it probably optimizes redraw by assuming
-            // that previously drawn part doesn't change, but this is not the
-            // case when compositing it used).
-            {
-                PAINTSTRUCT ps;
-                ::BeginPaint(hwnd, &ps);
-                ::DefSubclassProc(hwnd, WM_PAINT, (WPARAM)ps.hdc, 0);
-                ::EndPaint(hwnd, &ps);
-            }
-            return 0;
-
-        case WM_NCDESTROY:
-            ::RemoveWindowSubclass(hwnd, DateTimeUDProc, uIdSubclass);
-            break;
-    }
-
-    return ::DefSubclassProc(hwnd, nMsg, wParam, lParam);
-}
-
-} // namespace wxMSWImpl
-
 bool
 wxDateTimePickerCtrl::MSWCreateDateTimePicker(wxWindow *parent,
                                               wxWindowID id,

     else
         SetValue(wxDateTime::Now());
 
-    // If have an up-down control, we must explicitly paint it ourselves
-    // because otherwise it may be not redrawn at all with WS_EX_COMPOSITED.
-    WinStruct<DATETIMEPICKERINFO> info;
-    ::SendMessage(GetHwnd(), DTM_GETDATETIMEPICKERINFO, 0, (LPARAM)&info);
-    if ( info.hwndUD )
-    {
-        ::SetWindowSubclass(info.hwndUD, wxMSWImpl::DateTimeUDProc, 0, 0);
-    }
-
     return true;
 }
 

src/msw/dragimag.cpp


     wxASSERT_MSG( (m_hImageList != 0), wxT("Image list must not be null in BeginDrag."));
     wxASSERT_MSG( (window != 0), wxT("Window must not be null in BeginDrag."));
 
-    // Using ImageList_BeginDrag() doesn't work with composited windows,
-    // nothing gets shown, so reset WS_EX_COMPOSITED to make it work.
-    window->MSWDisableComposited();
-
     m_fullScreen = fullScreen;
     if (rect)
         m_boundingRect = * rect;

src/msw/glcanvas.cpp


     if ( !CreateWindow(parent, id, pos, size, style, name) )
         return false;
 
-    MSWDisableComposited();
-
     // Choose a matching pixel format.
     // Need a PIXELFORMATDESCRIPTOR for SetPixelFormat()
     PIXELFORMATDESCRIPTOR pfd;

src/msw/listctrl.cpp


     if ( !MSWCreateControl(WC_LISTVIEW, wxEmptyString, pos, size) )
         return false;
 
-    // LISTVIEW generates and endless stream of LVN_ODCACHEHINT event for a
-    // virtual wxListCtrl, so disable WS_EX_COMPOSITED.
-    if ( IsVirtual() )
-        MSWDisableComposited();
-
     const wxVisualAttributes& defAttrs = GetDefaultAttributes();
 
     if ( wxMSWDarkMode::IsActive() )

src/msw/spinbutt.cpp


 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/app.h"
-    #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
 #endif
 

     }
     else
     {
-        // We need to always paint this control explicitly instead of letting
-        // DefWndProc() do it, as this avoids whichever optimization the latter
-        // function does when WS_EX_COMPOSITED is on that result in not drawing
-        // parts of the control at all (see #23656).
-        wxPaintDC dc(this);
-
-        wxSpinButtonBase::OnPaint(event);
+        event.Skip();
     }
 }
 

src/msw/statbox.cpp


     // means we don't need to do anything.
     if ( GetBackgroundStyle() != wxBG_STYLE_PAINT )
     {
-        wxMSWWinExStyleUpdater(GetHwnd()).TurnOff(WS_EX_TRANSPARENT);
-
         Bind(wxEVT_PAINT, &wxStaticBox::OnPaint, this);
 
         // Our OnPaint() completely erases our background, so don't do it in

     }
 }
 
-void wxStaticBox::MSWOnDisabledComposited()
-{
-    // We need to enable custom painting if we're not using compositing any
-    // longer, as otherwise the window is not drawn correctly due to it using
-    // WS_EX_TRANSPARENT and thus not redrawing its background.
-    UseCustomPaint();
-}
-
 bool wxStaticBox::Create(wxWindow* parent,
                          wxWindowID id,
                          wxWindow* labelWin,

src/msw/webview_edge.cpp


         return false;
     }
 
-    MSWDisableComposited();
-
     if (!m_impl->Create())
         return false;
     Bind(wxEVT_SIZE, &wxWebViewEdge::OnSize, this);

src/msw/window.cpp


     msflags &= ~WS_BORDER;
 #endif // wxUniversal
 
-    // Enable double buffering by default for all our own, i.e. not the ones
-    // using native controls, classes.
-    //
-    // The loop here is a bogus one just to create a block that we can break
-    // from, it never executes more than once.
-    while ( !classname )
-    {
-        // WS_EX_COMPOSITED seems to be incompatible with WS_EX_TOPMOST, so
-        // don't use it for:
-
-        // Popup windows that get created with this style themselves: this
-        // seems to work under Windows 10, but doesn't under Windows 7 and
-        // using WS_EX_COMPOSITED for these windows that are temporarily
-        // doesn't seem to be very useful anyhow, so don't bother testing for
-        // the OS version and just always disable it for them.
-        if ( exstyle & WS_EX_TOPMOST )
-            break;
-
-        // Children of such windows as this doesn't work either (see #23078).
-        wxWindow* const tlw = wxGetTopLevelParent(this);
-        if ( tlw && tlw->HasFlag(wxSTAY_ON_TOP) )
-            break;
-
-        // We also allow disabling the use of this style globally by setting
-        // a system option if nothing else (i.e. turning it off for individual
-        // windows) works.
-        if ( wxSystemOptions::GetOptionInt("msw.window.no-composited") )
-            break;
-
-        // Do enable composition for this window.
-
-        exstyle |= WS_EX_COMPOSITED;
-
-        // We have to use the class including CS_[HV]REDRAW bits, as
-        // WS_EX_COMPOSITED doesn't work correctly if the entire window is
-        // not redrawn every time it's drawn.
-        style |= wxFULL_REPAINT_ON_RESIZE;
-
-        break;
-    }
-
     if ( IsShown() )
     {
         msflags |= WS_VISIBLE;

 {
     for ( auto win = this; win; win = win->GetParent() )
     {
-        // We never set WS_EX_COMPOSITED on TLWs, and we shouldn't recurse into
-        // different windows, so we can stop here.
+        wxMSWWinExStyleUpdater(GetHwndOf(win)).TurnOff(WS_EX_COMPOSITED);
+
         if ( win->IsTopLevel() )
             break;
-
-        wxMSWWinExStyleUpdater updater(GetHwndOf(win));
-        updater.TurnOff(WS_EX_COMPOSITED);
-        if ( updater.Apply() )
-            win->CallForEachChild([](wxWindow* w) { w->MSWOnDisabledComposited(); });
     }
 }
 

tests/controls/slidertest.cpp


 
     CPPUNIT_ASSERT(track.GetCount() != 0);
     CPPUNIT_ASSERT_EQUAL(1, release.GetCount());
-#if defined(__WXMSW__) || defined(__WXGTK__) || \
-    (defined(__WXQT__) && QT_VERSION < QT_VERSION_CHECK(6, 8, 0))
+
+#ifdef __WXQT__
+    #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+        WARN("wxEVT_SCROLL_CHANGED is generated twice with Qt 6.8, skipping test");
+        return;
+    #endif
+#endif
+#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXQT__)
     CPPUNIT_ASSERT_EQUAL(1, changed.GetCount());
 #endif
 #endif

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. Manage all notifications · Help

Reply all

Reply to author

Forward

0 new messages

Search

Clear search

Close search

Google apps

Main menu