Mercurial > dwindows

changeset 3001:a464a74505f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win: Remove no longer supported GTK leftovers.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 10 Sep 2023 20:37:16 +0000
parents 5ad5484bd03a
children a70d8ce6151c
files configure configure.ac dw.h dwconfig.h.in gtk/dw.c gtk3/dw.c
diffstat 6 files changed, 10 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Tue Jun 13 23:49:44 2023 +0000
+++ b/configure	Sun Sep 10 20:37:16 2023 +0000
@@ -6144,13 +6144,6 @@
 ARCH=""
 
 case "$target" in
-   *cygwin*)
-   ;;
-   *mingw32)
-
-printf "%s\n" "#define DW_USE_GTK 1" >>confdefs.h
-
-   ;;
    *linux*)
       SONAME="-Wl,-soname,lib$TARGET.so.\$(DW_MAJOR_VERSION)"
    ;;
--- a/configure.ac	Tue Jun 13 23:49:44 2023 +0000
+++ b/configure.ac	Sun Sep 10 20:37:16 2023 +0000
@@ -128,11 +128,6 @@
 ARCH=""
 
 case "$target" in
-   *cygwin*)
-   ;;
-   *mingw32)
-      AC_DEFINE(DW_USE_GTK,1,Uses GTK but not on X11 or Wayland)
-   ;;
    *linux*)
       SONAME="-Wl,-soname,lib$TARGET.so.\$(DW_MAJOR_VERSION)"
    ;;
--- a/dw.h	Tue Jun 13 23:49:44 2023 +0000
+++ b/dw.h	Sun Sep 10 20:37:16 2023 +0000
@@ -127,15 +127,8 @@
 /* Control size constants */
 #define DW_SIZE_AUTO    -1
 
-/* ensure we can build the Gtk port with MingW on Windows */
-#if defined(DW_USE_GTK) && defined(__MINGW32__)
-# ifndef GDK_WINDOWING_WIN32
-#   define GDK_WINDOWING_WIN32
-# endif
-#endif
-
-#if defined(__OS2__) || (defined(__WIN32__) && !defined(GDK_WINDOWING_WIN32)) || defined(__MAC__) || defined(__IOS__) || defined(__EMX__) || defined(__ANDROID__) || defined(__TEMPLATE__)
-/* OS/2, Windows or MacOS */
+#if defined(__OS2__) || defined(__WIN32__) || defined(__MAC__) || defined(__IOS__) || defined(__EMX__) || defined(__ANDROID__) || defined(__TEMPLATE__)
+/* Non-GTK platforms */
 
 #ifdef __OS2__
 # if (defined(__IBMC__) || defined(__WATCOMC__) || defined(_System)) && !defined(API)
--- a/dwconfig.h.in	Tue Jun 13 23:49:44 2023 +0000
+++ b/dwconfig.h.in	Sun Sep 10 20:37:16 2023 +0000
@@ -1,8 +1,5 @@
 /* dwconfig.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Uses GTK but not on X11 or Wayland */
-#undef DW_USE_GTK
-
 /* Define to 1 if you have the `connect' function. */
 #undef HAVE_CONNECT
 
--- a/gtk/dw.c	Tue Jun 13 23:49:44 2023 +0000
+++ b/gtk/dw.c	Sun Sep 10 20:37:16 2023 +0000
@@ -11,12 +11,10 @@
 #include "dw.h"
 #include <string.h>
 #include <stdlib.h>
-#if !defined(GDK_WINDOWING_WIN32)
-# include <sys/utsname.h>
-# include <sys/socket.h>
-# include <sys/un.h>
-# include <sys/mman.h>
-#endif
+#include <sys/utsname.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/mman.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>
--- a/gtk3/dw.c	Tue Jun 13 23:49:44 2023 +0000
+++ b/gtk3/dw.c	Sun Sep 10 20:37:16 2023 +0000
@@ -12,12 +12,10 @@
 #include <glib/gi18n.h>
 #include <string.h>
 #include <stdlib.h>
-#if !defined(GDK_WINDOWING_WIN32)
-# include <sys/utsname.h>
-# include <sys/socket.h>
-# include <sys/un.h>
-# include <sys/mman.h>
-#endif
+#include <sys/utsname.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/mman.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>