From 5ebcfd768188acf937aee964149a9f81884a763b Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Thu, 14 Apr 2022 22:33:38 +0200 Subject: [PATCH 1/2] Fix warnings in GTK2 build --- src/gtk/eggtrayicon.c | 5 +++++ src/gtk/window.cpp | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/gtk/eggtrayicon.c b/src/gtk/eggtrayicon.c index fbb683a9f8..c66ce60260 100644 --- a/src/gtk/eggtrayicon.c +++ b/src/gtk/eggtrayicon.c @@ -296,6 +296,7 @@ egg_tray_icon_get_orientation_property (EggTrayIcon *icon) static GdkFilterReturn egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data) { + (void)event; EggTrayIcon *icon = user_data; XEvent *xev = (XEvent *)xevent; @@ -451,6 +452,7 @@ egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon) static gboolean transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) { + (void)user_data; gdk_window_clear_area (widget->window, event->area.x, event->area.y, event->area.width, event->area.height); return FALSE; @@ -460,12 +462,15 @@ static void make_transparent_again (GtkWidget *widget, GtkStyle *previous_style, gpointer user_data) { + (void)previous_style; + (void)user_data; gdk_window_set_back_pixmap (widget->window, NULL, TRUE); } static void make_transparent (GtkWidget *widget, gpointer user_data) { + (void)user_data; if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget)) return; diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index bc9b628bfb..cfe734277a 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1065,7 +1065,9 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event, #ifdef HAVE_X11_XKBLIB_H KeySym keysymNormalized = XkbKeycodeToKeysym(dpy, keycode, 0, 0); #else + wxGCC_WARNING_SUPPRESS(deprecated-declarations) KeySym keysymNormalized = XKeycodeToKeysym(dpy, keycode, 0); + wxGCC_WARNING_RESTORE() #endif // use the normalized, i.e. lower register, keysym if we've From 34afcb57a89dca97969095cd6defcc35480c4826 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Thu, 14 Apr 2022 22:59:08 +0200 Subject: [PATCH 2/2] CMake: Improve Linux GTK2 build Use version comparison instead of normal comparison for libnotify. Fix warning if mismatched if statement in FindGNOMEVFS2. Check for GREATER_EQUAL GTK versions, same as configure does. Don't check for GTK 1 or define __WXGTK127__. CMake does not support GTK1 and it should not be defined when GTK 2/3/4 is used. --- build/cmake/init.cmake | 2 +- build/cmake/modules/FindGNOMEVFS2.cmake | 2 +- build/cmake/setup.cmake | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 19449d9d37..4fe4cb9540 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -510,7 +510,7 @@ if(wxUSE_GUI) if(NOT LIBNOTIFY_FOUND) message(WARNING "Libnotify not found, it won't be used for notifications") wx_option_force_value(wxUSE_LIBNOTIFY OFF) - elseif((LIBNOTIFY_VERSION GREATER 0.7) OR (LIBNOTIFY_VERSION EQUAL 0.7)) + elseif(LIBNOTIFY_VERSION VERSION_GREATER_EQUAL 0.7) set(wxUSE_LIBNOTIFY_0_7 ON) endif() else() diff --git a/build/cmake/modules/FindGNOMEVFS2.cmake b/build/cmake/modules/FindGNOMEVFS2.cmake index 1dccf3a2bf..1313975ea1 100644 --- a/build/cmake/modules/FindGNOMEVFS2.cmake +++ b/build/cmake/modules/FindGNOMEVFS2.cmake @@ -78,7 +78,7 @@ else (GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS) message(STATUS "Found GnomeVFS2: ${GNOMEVFS2_LIBRARIES}") endif (NOT GNOMEVFS2_FIND_QUIETLY) else (GNOMEVFS2_FOUND) - if (GnomeVFS2_FIND_REQUIRED) + if (GNOMEVFS2_FIND_REQUIRED) message(FATAL_ERROR "Could not find GnomeVFS2") endif (GNOMEVFS2_FIND_REQUIRED) endif (GNOMEVFS2_FOUND) diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake index d294178203..fcb784b6ca 100644 --- a/build/cmake/setup.cmake +++ b/build/cmake/setup.cmake @@ -57,8 +57,8 @@ endif() if(WXGTK) # Add GTK version definitions - foreach(gtk_version 1.2.7 2.0 2.10 2.18 2.20 3.0 3.90.0) - if(wxTOOLKIT_VERSION VERSION_GREATER gtk_version) + foreach(gtk_version 2.0 2.10 2.18 2.20 3.0 3.90.0) + if(wxTOOLKIT_VERSION VERSION_GREATER_EQUAL gtk_version) if(gtk_version EQUAL 3.90.0) set(__WXGTK4__ ON) elseif(gtk_version EQUAL 3.0)