diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index 8fc23d66cd..54bdea87ac 100644
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -15,12 +15,11 @@
 #include "wx/dcclient.h"
 #include "wx/window.h"
 
-// Split platforms into two groups - those which have well-working
-// double-buffering by default, and those which do not.
-#if defined(__WXMAC__) || defined(__WXGTK20__) || defined(__WXDFB__) || defined(__WXQT__)
-    #define wxALWAYS_NATIVE_DOUBLE_BUFFER       1
-#else
+// Only deprecated wxGTK1 and wxMotif platforms don't use double buffering.
+#if defined(__WXMOTIF__) || (defined(__WXGTK__) && !defined(__WXGTK20__))
     #define wxALWAYS_NATIVE_DOUBLE_BUFFER       0
+#else
+    #define wxALWAYS_NATIVE_DOUBLE_BUFFER       1
 #endif