From: Thomas Debesse <dev@illwieckz.net>
Date: Mon, 20 Jun 2022 02:44:49 +0000 (+0200)
Subject: Merge commit 'c3765eb6e7f6879e5a34c48f71e5ee7bc8b8851f' into master-merge
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=bff6a16b47f8db761c57ce4c17d35916a4da6f1e;p=xonotic%2Fnetradiant.git

Merge commit 'c3765eb6e7f6879e5a34c48f71e5ee7bc8b8851f' into master-merge
---

bff6a16b47f8db761c57ce4c17d35916a4da6f1e
diff --cc radiant/CMakeLists.txt
index f93b00cf,1edced73..08e76bcf
--- a/radiant/CMakeLists.txt
+++ b/radiant/CMakeLists.txt
@@@ -34,8 -34,10 +34,9 @@@ set(RADIANTLIS
      error.cpp error.h
      feedback.cpp feedback.h
      filetypes.cpp filetypes.h
+     filterbar.cpp filterbar.h
      filters.cpp filters.h
      findtexturedialog.cpp findtexturedialog.h
 -    glwidget.cpp glwidget.h
      grid.cpp grid.h
      groupdialog.cpp groupdialog.h
      gtkdlgs.cpp gtkdlgs.h
diff --cc radiant/mainframe.cpp
index f87f4725,196a60df..be1e9850
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@@ -100,19 -100,8 +100,20 @@@
  #include "feedback.h"
  #include "referencecache.h"
  #include "texwindow.h"
+ #include "filterbar.h"
  
 +#if GDEF_OS_WINDOWS
 +#include <process.h>
 +#else
 +#include <spawn.h>
 +#endif
 +
 +#ifdef WORKAROUND_WINDOWS_GTK2_GLWIDGET
 +/* workaround for gtk 2.24 issue: not displayed glwidget after toggle */
 +#define WORKAROUND_GOBJECT_SET_GLWIDGET(window, widget) g_object_set_data( G_OBJECT( window ), "glwidget", G_OBJECT( widget ) )
 +#else
 +#define WORKAROUND_GOBJECT_SET_GLWIDGET(window, widget)
 +#endif
  
  struct layout_globals_t
  {