Swell Wayland (Linux)

WDL/swell/Makefile

@@ -137,6 +137,9 @@ ifndef NOGDK
         CFLAGS += -DSWELL_PRELOAD="libgdk-3.so.0"
       endif
     endif
+    ifdef WAYLAND
+      CFLAGS += -DSWELL_TARGET_WAYLAND
+    endif
   endif
   CFLAGS += -DSWELL_LICE_GDI
   OBJS += $(LICE_OBJS)

WDL/swell/swell-dlg-generic.cpp

@@ -255,6 +255,10 @@ int SWELL_DialogBox(SWELL_DialogResourceIndex *reshead, const char *resid, HWND
       Sleep(10);
     }
     ret=r.ret;
+#ifdef SWELL_TARGET_WAYLAND
+    if (hwnd->m_oswidget && GTK_IS_WINDOW(hwnd->m_oswidget))
+      gtk_window_set_modal(GTK_WINDOW(hwnd->m_oswidget), FALSE);
+#endif
     s_modalDialogs.DeletePtr(&r);
 
     a = SWELL_topwindows;

WDL/swell/swell-gdi-lice.cpp

@@ -1841,7 +1841,13 @@ void ImageList_Destroy(HIMAGELIST list)
 
 int ImageList_ReplaceIcon(HIMAGELIST list, int offset, HICON image)
 {
-  if (WDL_NOT_NORMALLY(!image || !list)) return -1;
+  if (WDL_NOT_NORMALLY(!list)) return -1;
+#ifdef SWELL_TARGET_WAYLAND
+  // Media Explorer passes a NULL icon on Wayland (icon failed to load)
+  if (!image) return -1;
+#else
+  if (WDL_NOT_NORMALLY(!image)) return -1;
+#endif
   WDL_PtrList<HGDIOBJ__> *l=(WDL_PtrList<HGDIOBJ__> *)list;
 
   HGDIOBJ__ *imgsrc = (HGDIOBJ__*)image;