allocate HFONT on demand instead of doing every time a font property is modified

[wxWidgets.git] / include / wx / chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index e4d8d71527f0203c6c20ed22c3e8e0528cbb5a0a..98ec5fbdcbddc803fe37fa20118f726baecd441d 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -972,16 +972,16 @@
    check consistency of the settings
  */
 
    check consistency of the settings
  */
 

-#if WXWIN_COMPATIBILITY_2_4
-#   if !WXWIN_COMPATIBILITY_2_6
+#if WXWIN_COMPATIBILITY_2_6
+#   if !WXWIN_COMPATIBILITY_2_8

 #       ifdef wxABORT_ON_CONFIG_ERROR
 #       ifdef wxABORT_ON_CONFIG_ERROR

-#           error "2.4.X compatibility requires 2.6.X compatibility"
+#           error "2.6.X compatibility requires 2.8.X compatibility"

 #       else
 #       else

-#           undef WXWIN_COMPATIBILITY_2_6
-#           define WXWIN_COMPATIBILITY_2_6 1
+#           undef WXWIN_COMPATIBILITY_2_8
+#           define WXWIN_COMPATIBILITY_2_8 1

 #       endif
 #   endif
 #       endif
 #   endif

-#endif /* WXWIN_COMPATIBILITY_2_4 */
+#endif /* WXWIN_COMPATIBILITY_2_6 */

 
 #if wxUSE_ARCHIVE_STREAMS
 #   if !wxUSE_DATETIME
 
 #if wxUSE_ARCHIVE_STREAMS
 #   if !wxUSE_DATETIME