Mercurial > dwindows

diff dw.h @ 2203:12fb7f32f3a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GTK: DW_INCLUDE_DEPRECATED should bring in DW_INCLUDE_DEPRECATED_RESOURCES. Can configure --with-deprecated to include our old resource system. Fix building with older GTK releases, until GTK2 support can be added.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 29 Nov 2020 04:17:58 +0000
parents c677d728e143
children b86ae2abb3b3
line wrap: on
line diff
--- a/dw.h	Sat Nov 28 23:47:30 2020 +0000
+++ b/dw.h	Sun Nov 29 04:17:58 2020 +0000
@@ -1347,14 +1347,14 @@
 } DWResources;
 
 /* As of Dynamic Windows 3.1 GResource is default if supported.
- * Defining DW_INCLUDE_DEPRECATED_RESOURCES at compile time will
- * include support for our old home brewed resource system.
+ * Using --with-deprecated at configure time will include
+ * support for our old home brewed resource system.
  * GLib 2.32 is required for GResource, so we automatically 
  * enable our old system if using an old Glib.
  * Test for GResource using: dwindows-config --gresource
  */
 #ifndef DW_INCLUDE_DEPRECATED_RESOURCES
-#if !GLIB_CHECK_VERSION(2,32,0)
+#if defined(DW_INCLUDE_DEPRECATED) || GTK_MAJOR_VERSION < 3 || !GLIB_CHECK_VERSION(2,32,0)
 #define DW_INCLUDE_DEPRECATED_RESOURCES 1
 #endif
 #endif