From e4eedfe6620362a9bf0387b51cb0a10dde53e630 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Fri, 13 Sep 2019 10:18:14 -0700 Subject: [PATCH] Remove test for GDK_MODIFIER_INTENT_MOD_SELECTION. Added in 3.14, we require 3.18. --- gnucash/CMakeLists.txt | 14 -------------- gnucash/gnome-utils/CMakeLists.txt | 9 --------- gnucash/register/register-gnome/CMakeLists.txt | 10 ---------- 3 files changed, 33 deletions(-) diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt index b9d446dbf9..2cbd01aacb 100644 --- a/gnucash/CMakeLists.txt +++ b/gnucash/CMakeLists.txt @@ -4,20 +4,6 @@ set(SCHEMADIR_BUILD ${DATADIR_BUILD}/glib-2.0/schemas) file(MAKE_DIRECTORY ${SCHEMADIR_BUILD}) unset(gschema_depends CACHE) -# Check for GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK; it's Gtk3-14 and later. -include(CheckCSourceCompiles) -unset(have_mod_mask CACHE) -set(CMAKE_REQUIRED_INCLUDES ${GTK3_INCLUDE_DIRS}) -check_c_source_compiles(" -#include - -int main (int argc, char** argv) { - GdkModifierIntent foo = GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK; - return 0; -} -" - have_mod_mask) - # The subdirectories add_subdirectory (gnome) add_subdirectory (gnome-utils) diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt index 604b34c6bd..45cc0de36b 100644 --- a/gnucash/gnome-utils/CMakeLists.txt +++ b/gnucash/gnome-utils/CMakeLists.txt @@ -25,15 +25,6 @@ add_custom_command( ${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${GNC_WARNINGS_H} ${CMAKE_CURRENT_SOURCE_DIR}/make-gnc-warnings-h.xsl ${WARNINGS_SCHEMA} ) -#GTK before 3.14 didn't have GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK -if (NOT have_mod_mask) -if (MAC_INTEGRATION) - add_definitions(-DGDK_MODIFIER_INTENT_DEFAULT_MOD_MASK=GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_MOD2_MASK|GDK_SUPER_MASK|GDK_HYPER_MASK|GDK_META_MASK) -else (MAC_INTEGRATION) - add_definitions(-DGDK_MODIFIER_INTENT_DEFAULT_MOD_MASK=GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SUPER_MASK|GDK_HYPER_MASK|GDK_META_MASK) -endif (MAC_INTEGRATION) -endif (NOT have_mod_mask) - set (gnome_utils_SOURCES account-quickfill.c assistant-xml-encoding.c diff --git a/gnucash/register/register-gnome/CMakeLists.txt b/gnucash/register/register-gnome/CMakeLists.txt index 5aa82ffa34..887fc14810 100644 --- a/gnucash/register/register-gnome/CMakeLists.txt +++ b/gnucash/register/register-gnome/CMakeLists.txt @@ -1,16 +1,6 @@ add_subdirectory(test) include(CheckSymbolExists) -#GTK before 3.14 didn't have GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK -check_symbol_exists(GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK gdk/gdktypes.h have_mod_mask) -if (NOT have_mod_mask) -if (MAC_INTEGRATION) - add_definitions(-DGDK_MODIFIER_INTENT_DEFAULT_MOD_MASK=GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_MOD2_MASK|GDK_SUPER_MASK|GDK_HYPER_MASK|GDK_META_MASK) -else (MAC_INTEGRATION) - add_definitions(-DGDK_MODIFIER_INTENT_DEFAULT_MOD_MASK=GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SUPER_MASK|GDK_HYPER_MASK|GDK_META_MASK) -endif(MAC_INTEGRATION) -endif(NOT have_mod_mask) - set (register_gnome_SOURCES gncmod-register-gnome.c combocell-gnome.c