summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Valavanis <valavanisalex@gmail.com>2019-05-26 15:11:07 +0000
committerAlexander Valavanis <valavanisalex@gmail.com>2019-05-26 15:11:07 +0000
commit630be8274013c5eef5f19e19a14bc6d759aada5a (patch)
tree6774d8db433426ab8361e18638869ad2336bf705 /src
parentRename wrong named function (diff)
downloadinkscape-630be8274013c5eef5f19e19a14bc6d759aada5a.tar.gz
inkscape-630be8274013c5eef5f19e19a14bc6d759aada5a.zip
Rm unused code now Gtk+ >= 3.22 dependency is set
Diffstat (limited to 'src')
-rw-r--r--src/debug/log-display-config.cpp41
-rw-r--r--src/desktop-events.cpp17
-rw-r--r--src/device-manager.cpp46
-rw-r--r--src/display/canvas-rotate.cpp2
-rw-r--r--src/display/sp-canvas-item.h2
-rw-r--r--src/display/sp-canvas.cpp52
-rw-r--r--src/ege-color-prof-tracker.cpp20
-rw-r--r--src/extension/extension.cpp4
-rw-r--r--src/extension/internal/pdfinput/pdf-input.cpp27
-rw-r--r--src/extension/param/notebook.cpp4
-rw-r--r--src/file-update.cpp11
-rw-r--r--src/inkscape.cpp22
-rw-r--r--src/knot.cpp19
-rw-r--r--src/live_effects/parameter/message.cpp12
-rw-r--r--src/ui/contextmenu.cpp4
-rw-r--r--src/ui/dialog/document-properties.cpp32
-rw-r--r--src/ui/dialog/filter-editor.cpp10
-rw-r--r--src/ui/dialog/filter-effects-dialog.cpp21
-rw-r--r--src/ui/dialog/guides.cpp16
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp61
-rw-r--r--src/ui/dialog/input.cpp7
-rw-r--r--src/ui/dialog/layers.cpp8
-rw-r--r--src/ui/dialog/new-from-template.cpp5
-rw-r--r--src/ui/dialog/objects.cpp9
-rw-r--r--src/ui/dialog/svg-fonts-dialog.cpp12
-rw-r--r--src/ui/dialog/swatches.cpp5
-rw-r--r--src/ui/dialog/symbols.cpp23
-rw-r--r--src/ui/dialog/symbols.h2
-rw-r--r--src/ui/event-debug.h11
-rw-r--r--src/ui/monitor.cpp26
-rw-r--r--src/ui/previewholder.cpp2
-rw-r--r--src/ui/tool/control-point.cpp6
-rw-r--r--src/ui/toolbar/arc-toolbar.cpp10
-rw-r--r--src/ui/toolbar/connector-toolbar.cpp4
-rw-r--r--src/ui/toolbar/rect-toolbar.cpp6
-rw-r--r--src/ui/toolbar/spiral-toolbar.cpp6
-rw-r--r--src/ui/toolbar/star-toolbar.cpp7
-rw-r--r--src/ui/tools/arc-tool.cpp8
-rw-r--r--src/ui/tools/box3d-tool.cpp8
-rw-r--r--src/ui/tools/calligraphic-tool.cpp4
-rw-r--r--src/ui/tools/dropper-tool.cpp4
-rw-r--r--src/ui/tools/eraser-tool.cpp4
-rw-r--r--src/ui/tools/freehand-base.cpp4
-rw-r--r--src/ui/tools/measure-tool.cpp4
-rw-r--r--src/ui/tools/pen-tool.cpp2
-rw-r--r--src/ui/tools/pencil-tool.cpp4
-rw-r--r--src/ui/tools/rect-tool.cpp10
-rw-r--r--src/ui/tools/select-tool.cpp8
-rw-r--r--src/ui/tools/spiral-tool.cpp9
-rw-r--r--src/ui/tools/star-tool.cpp8
-rw-r--r--src/ui/tools/text-tool.cpp8
-rw-r--r--src/ui/tools/tool-base.cpp22
-rw-r--r--src/ui/tools/zoom-tool.cpp4
-rw-r--r--src/ui/widget/color-icc-selector.cpp9
-rw-r--r--src/ui/widget/color-notebook.cpp15
-rw-r--r--src/ui/widget/color-scales.cpp15
-rw-r--r--src/ui/widget/color-slider.cpp16
-rw-r--r--src/ui/widget/font-variants.cpp36
-rw-r--r--src/ui/widget/frame.cpp6
-rw-r--r--src/ui/widget/labelled.cpp5
-rw-r--r--src/ui/widget/preferences-widget.cpp8
-rw-r--r--src/ui/widget/selected-style.cpp22
-rw-r--r--src/ui/widget/style-swatch.cpp12
-rw-r--r--src/widgets/desktop-widget.cpp30
-rw-r--r--src/widgets/ege-adjustment-action.cpp5
-rw-r--r--src/widgets/gimp/ruler.cpp2
-rw-r--r--src/widgets/sp-attribute-widget.cpp10
-rw-r--r--src/widgets/spw-utilities.cpp6
-rw-r--r--src/widgets/toolbox.cpp14
69 files changed, 124 insertions, 770 deletions
diff --git a/src/debug/log-display-config.cpp b/src/debug/log-display-config.cpp
index e96802847..7de69bea6 100644
--- a/src/debug/log-display-config.cpp
+++ b/src/debug/log-display-config.cpp
@@ -28,19 +28,11 @@ typedef SimpleEvent<Event::CONFIGURATION> ConfigurationEvent;
class Monitor : public ConfigurationEvent {
public:
-#if GTK_CHECK_VERSION(3,22,0)
Monitor(GdkMonitor *monitor)
-#else
- Monitor(GdkScreen *screen, gint monitor)
-#endif
- : ConfigurationEvent("monitor") {
+ : ConfigurationEvent("monitor")
+ {
GdkRectangle area;
-
-#if GTK_CHECK_VERSION(3,22,0)
gdk_monitor_get_geometry(monitor, &area);
-#else
- gdk_screen_get_monitor_geometry(screen, monitor, &area);
-#endif
_addProperty("x", area.x);
_addProperty("y", area.y);
@@ -49,34 +41,12 @@ public:
}
};
-#if !GTK_CHECK_VERSION(3,22,0)
-// We don't need this in newer Gtk+ versions as GdkMonitor information is now
-// returned directly from GdkDisplay rather than needing GdkScreen first
-class Screen : public ConfigurationEvent {
-public:
- Screen(GdkScreen *s) : ConfigurationEvent("screen"), screen(s) {
- _addProperty("width", gdk_screen_get_width(screen));
- _addProperty("height", gdk_screen_get_height(screen));
- }
- void generateChildEvents() const {
- gint n_monitors = gdk_screen_get_n_monitors(screen);
- for ( gint i = 0 ; i < n_monitors ; i++ ) {
- Logger::write<Monitor>(screen, i);
- }
- }
-
-private:
- GdkScreen *screen;
-};
-#endif
-
class Display : public ConfigurationEvent {
public:
Display() : ConfigurationEvent("display") {}
void generateChildEvents() const override {
GdkDisplay *display=gdk_display_get_default();
-#if GTK_CHECK_VERSION(3,22,0)
gint const n_monitors = gdk_display_get_n_monitors(display);
// Loop through all monitors and log their details
@@ -84,13 +54,6 @@ public:
GdkMonitor *monitor = gdk_display_get_monitor(display, i_monitor);
Logger::write<Monitor>(monitor);
}
-#else
- // We used to find the number of screens, and log info for
- // each of them. However, the number of screens is always
- // one in Gtk+ 3
- GdkScreen *screen = gdk_display_get_default_screen(display);
- Logger::write<Screen>(screen);
-#endif
}
};
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index e35cd2aba..a87c2ac10 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -19,12 +19,9 @@
#include "desktop-events.h"
#include <gdkmm/display.h>
+#include <gdkmm/seat.h>
+
#include <gtk/gtk.h>
-#if GTK_CHECK_VERSION(3, 20, 0)
-# include <gdkmm/seat.h>
-#else
-# include <gdkmm/devicemanager.h>
-#endif
#include <glibmm/i18n.h>
@@ -113,7 +110,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
if (event->button.button == 1) {
drag_type = SP_DRAG_NONE;
sp_event_context_discard_delayed_snap_event(desktop->event_context);
- sp_canvas_item_ungrab(item, event->button.time);
+ sp_canvas_item_ungrab(item);
Inkscape::UI::Dialogs::GuidelinePropertiesDialog::showDialog(guide, desktop);
ret = TRUE;
}
@@ -327,7 +324,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
desktop->set_coordinate_status(event_dt);
}
drag_type = SP_DRAG_NONE;
- sp_canvas_item_ungrab(item, event->button.time);
+ sp_canvas_item_ungrab(item);
ret=TRUE;
}
break;
@@ -431,14 +428,8 @@ static void init_extended()
{
Glib::ustring avoidName("pad");
auto display = Gdk::Display::get_default();
-
-#if GTK_CHECK_VERSION(3, 20, 0)
auto seat = display->get_default_seat();
auto const devices = seat->get_slaves(Gdk::SEAT_CAPABILITY_ALL);
-#else
- auto dm = display->get_device_manager();
- auto const devices = dm->list_devices(Gdk::DEVICE_TYPE_SLAVE);
-#endif
if ( !devices.empty() ) {
for (auto const dev : devices) {
diff --git a/src/device-manager.cpp b/src/device-manager.cpp
index a9d9ef818..e9841a34b 100644
--- a/src/device-manager.cpp
+++ b/src/device-manager.cpp
@@ -15,16 +15,13 @@
#include "preferences.h"
-#include <glibmm/regex.h>
-
+// Only needed for gtk_accelerator_parse(). Can probably drop when we switch to Gtk+ 4
#include <gtk/gtk.h>
+#include <glibmm/regex.h>
+
#include <gdkmm/display.h>
-#if GTK_CHECK_VERSION(3, 20, 0)
-# include <gdkmm/seat.h>
-#else
-# include <gdkmm/devicemanager.h>
-#endif
+#include <gdkmm/seat.h>
#include <gtkmm/accelkey.h>
@@ -85,17 +82,17 @@ static Glib::ustring getBaseDeviceName(Gdk::InputSource source)
{
Glib::ustring name;
switch (source) {
- case GDK_SOURCE_MOUSE:
- name ="pointer";
+ case Gdk::SOURCE_MOUSE:
+ name = "pointer";
break;
- case GDK_SOURCE_PEN:
- name ="pen";
+ case Gdk::SOURCE_PEN:
+ name = "pen";
break;
- case GDK_SOURCE_ERASER:
- name ="eraser";
+ case Gdk::SOURCE_ERASER:
+ name = "eraser";
break;
- case GDK_SOURCE_CURSOR:
- name ="cursor";
+ case Gdk::SOURCE_CURSOR:
+ name = "cursor";
break;
default:
name = "tablet";
@@ -321,15 +318,9 @@ DeviceManagerImpl::DeviceManagerImpl() :
DeviceManager(),
devices()
{
- Glib::RefPtr<Gdk::Display> display = Gdk::Display::get_default();
-
-#if GTK_CHECK_VERSION(3, 20, 0)
- auto seat = display->get_default_seat();
+ auto display = Gdk::Display::get_default();
+ auto seat = display->get_default_seat();
auto devList = seat->get_slaves(Gdk::SEAT_CAPABILITY_ALL);
-#else
- auto dm = display->get_device_manager();
- auto devList = dm->list_devices(Gdk::DEVICE_TYPE_SLAVE);
-#endif
if (fakeList.empty()) {
createFakeList();
@@ -658,14 +649,9 @@ static void createFakeList() {
fakeList[3].num_keys = 7;
// try to find the first *real* core pointer
- Glib::RefPtr<Gdk::Display> display = Gdk::Display::get_default();
-#if GTK_CHECK_VERSION(3, 20, 0)
- auto seat = display->get_default_seat();
+ auto display = Gdk::Display::get_default();
+ auto seat = display->get_default_seat();
auto devList = seat->get_slaves(Gdk::SEAT_CAPABILITY_ALL);
-#else
- auto dm = display->get_device_manager();
- auto devList = dm->list_devices(Gdk::DEVICE_TYPE_SLAVE);
-#endif
// Set iterator to point at beginning of device list
std::vector< Glib::RefPtr<Gdk::Device> >::iterator dev = devList.begin();
diff --git a/src/display/canvas-rotate.cpp b/src/display/canvas-rotate.cpp
index f747c66f5..0a5fcb542 100644
--- a/src/display/canvas-rotate.cpp
+++ b/src/display/canvas-rotate.cpp
@@ -204,7 +204,7 @@ static int sp_canvas_rotate_event (SPCanvasItem *item, GdkEvent *event)
Geom::rad_from_deg(cr->angle) );
// We're done
- sp_canvas_item_ungrab (item, event->button.time);
+ sp_canvas_item_ungrab (item);
sp_canvas_item_hide (item);
cr->start_angle = -1000;
diff --git a/src/display/sp-canvas-item.h b/src/display/sp-canvas-item.h
index fc6417325..9856906c6 100644
--- a/src/display/sp-canvas-item.h
+++ b/src/display/sp-canvas-item.h
@@ -132,7 +132,7 @@ void sp_canvas_item_show(SPCanvasItem *item);
void sp_canvas_item_hide(SPCanvasItem *item);
void sp_canvas_item_destroy(SPCanvasItem *item);
int sp_canvas_item_grab(SPCanvasItem *item, unsigned int event_mask, GdkCursor *cursor, guint32 etime);
-void sp_canvas_item_ungrab(SPCanvasItem *item, guint32 etime);
+void sp_canvas_item_ungrab(SPCanvasItem *item);
Geom::Affine sp_canvas_item_i2w_affine(SPCanvasItem const *item);
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index bb8848a18..f77e6f31d 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -25,6 +25,8 @@
#include <gdkmm/devicemanager.h>
#include <gdkmm/display.h>
#include <gdkmm/rectangle.h>
+#include <gdkmm/seat.h>
+
#include <cairomm/region.h>
#include "cms-system.h"
@@ -46,15 +48,10 @@
#include <2geom/affine.h>
#include <2geom/rect.h>
-#if GTK_CHECK_VERSION(3,20,0)
-# include <gdkmm/seat.h>
-#endif
-
using Inkscape::Debug::GdkEventLatencyTracker;
-// gtk_check_version returns non-NULL on failure
-static bool const HAS_BROKEN_MOTION_HINTS =
- true || gtk_check_version(2, 12, 0) != nullptr;
+// Disabled by Mentalguy, many years ago in commit 427a81
+static bool const HAS_BROKEN_MOTION_HINTS = true;
// Define this to visualize the regions to be redrawn
//#define DEBUG_REDRAW 1;
@@ -71,18 +68,11 @@ struct SPCanvasGroupClass {
SPCanvasItemClass parent_class;
};
-static void ungrab_default_client_pointer(guint32 const time = GDK_CURRENT_TIME)
+static void ungrab_default_client_pointer()
{
auto const display = Gdk::Display::get_default();
-
-#if GTK_CHECK_VERSION(3,20,0)
- auto const seat = display->get_default_seat();
+ auto const seat = display->get_default_seat();
seat->ungrab();
-#else
- auto const dm = display->get_device_manager();
- auto const device = dm->get_client_pointer();
- device->ungrab(time);
-#endif
}
/**
@@ -662,8 +652,7 @@ int sp_canvas_item_grab(SPCanvasItem *item, guint event_mask, GdkCursor *cursor,
// fixme: If we add key masks to event mask, Gdk will abort (Lauris)
// fixme: But Canvas actually does get key events, so all we need is routing these here
auto display = gdk_display_get_default();
-#if GTK_CHECK_VERSION(3,20,0)
- auto seat = gdk_display_get_default_seat(display);
+ auto seat = gdk_display_get_default_seat(display);
gdk_seat_grab(seat,
getWindow(item->canvas),
GDK_SEAT_CAPABILITY_ALL_POINTING,
@@ -672,18 +661,6 @@ int sp_canvas_item_grab(SPCanvasItem *item, guint event_mask, GdkCursor *cursor,
nullptr,
nullptr,
nullptr);
-#else
- auto dm = gdk_display_get_device_manager(display);
- auto device = gdk_device_manager_get_client_pointer(dm);
-
- gdk_device_grab(device,
- getWindow(item->canvas),
- GDK_OWNERSHIP_NONE,
- FALSE,
- (GdkEventMask)(event_mask & (~(GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK))),
- cursor,
- etime);
-#endif
item->canvas->_grabbed_item = item;
item->canvas->_grabbed_event_mask = event_mask;
@@ -697,9 +674,8 @@ int sp_canvas_item_grab(SPCanvasItem *item, guint event_mask, GdkCursor *cursor,
* mouse.
*
* @param item A canvas item that holds a grab.
- * @param etime The timestamp for ungrabbing the mouse.
*/
-void sp_canvas_item_ungrab(SPCanvasItem *item, guint32 etime)
+void sp_canvas_item_ungrab(SPCanvasItem *item)
{
g_return_if_fail (item != nullptr);
g_return_if_fail (SP_IS_CANVAS_ITEM (item));
@@ -709,7 +685,7 @@ void sp_canvas_item_ungrab(SPCanvasItem *item, guint32 etime)
}
item->canvas->_grabbed_item = nullptr;
- ungrab_default_client_pointer(etime);
+ ungrab_default_client_pointer();
}
/**
@@ -2214,14 +2190,8 @@ bool SPCanvas::paintRect(int xx0, int yy0, int xx1, int yy1)
gint x, y;
auto const display = Gdk::Display::get_default();
-
-#if GTK_CHECK_VERSION(3,20,0)
- auto const seat = display->get_default_seat();
- auto const device = seat->get_pointer();
-#else
- auto const dm = display->get_device_manager();
- auto const device = dm->get_client_pointer();
-#endif
+ auto const seat = display->get_default_seat();
+ auto const device = seat->get_pointer();
gdk_window_get_device_position(gtk_widget_get_window(GTK_WIDGET(this)),
device->gobj(),
diff --git a/src/ege-color-prof-tracker.cpp b/src/ege-color-prof-tracker.cpp
index eae8bc23b..6672aef81 100644
--- a/src/ege-color-prof-tracker.cpp
+++ b/src/ege-color-prof-tracker.cpp
@@ -294,11 +294,7 @@ void track_screen( GdkScreen* screen, EgeColorProfTracker* tracker )
GdkDisplay* display = gdk_display_get_default();
-#if GTK_CHECK_VERSION(3,22,0)
int numMonitors = gdk_display_get_n_monitors(display);
-#else
- gint numMonitors = gdk_screen_get_n_monitors(screen);
-#endif
#ifdef GDK_WINDOWING_X11
tracked_screen->zeroSeen = FALSE;
@@ -355,9 +351,7 @@ void event_after_cb( GtkWidget* widget, GdkEvent* event, gpointer user_data )
EgeColorProfTracker* tracker = (EgeColorProfTracker*)user_data;
auto priv = EGE_COLOR_PROF_TRACKER_GET_PRIVATE (tracker);
- // In old Gtk+ versions, we can directly find the ID number for a monitor.
- // In Gtk+ >= 3.22, however, we need to figure out the ID
-#if GTK_CHECK_VERSION(3,22,0)
+ // In Gtk+ >= 3.22, we need to figure out the screen ID
auto display = gdk_display_get_default();
auto monitor = gdk_display_get_monitor_at_window(display, window);
@@ -370,10 +364,6 @@ void event_after_cb( GtkWidget* widget, GdkEvent* event, gpointer user_data )
auto monitor_at_index = gdk_display_get_monitor(display, i_monitor);
if(monitor_at_index == monitor) monitorNum = i_monitor;
}
-#else
- GdkScreen* screen = gtk_widget_get_screen(widget);
- gint monitorNum = gdk_screen_get_monitor_at_window(screen, window);
-#endif
if ( monitorNum != priv->_monitor && monitorNum != -1 ) {
priv->_monitor = monitorNum;
@@ -413,11 +403,7 @@ void screen_size_changed_cb(GdkScreen* screen, gpointer user_data)
if ( tracked_screen ) {
GdkDisplay* display = gdk_display_get_default();
-#if GTK_CHECK_VERSION(3,22,0)
int numMonitors = gdk_display_get_n_monitors(display);
-#else
- gint numMonitors = gdk_screen_get_n_monitors(screen);
-#endif
if ( numMonitors > (gint)tracked_screen->profiles->len ) {
for ( guint i = tracked_screen->profiles->len; i < (guint)numMonitors; i++ ) {
@@ -543,12 +529,8 @@ void add_x11_tracking_for_screen(GdkScreen* screen)
if ( propArray ) {
int j = 0;
-#if GTK_CHECK_VERSION(3,22,0)
auto display = gdk_display_get_default();
int numMonitors = gdk_display_get_n_monitors(display);
-#else
- gint numMonitors = gdk_screen_get_n_monitors(screen);
-#endif
if ( baseAtom != None ) {
for ( i = 0; i < numWinProps; i++ ) {
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 9bbeabd45..a373e5ec0 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -685,11 +685,7 @@ public:
*/
void addWidget(Gtk::Widget *widg, gchar const *tooltip, int indent) {
if (widg) {
-#if GTK_CHECK_VERSION(3,12,0)
widg->set_margin_start(indent * Parameter::GUI_INDENTATION);
-#else
- widg->set_margin_left(indent * Parameter::GUI_INDENTATION);
-#endif
this->pack_start(*widg, false, false, 0);
if (tooltip) {
widg->set_tooltip_text(tooltip);
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 3ff599ebf..ed6af682e 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -163,7 +163,6 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/)
okbutton->set_can_default();
okbutton->set_relief(Gtk::RELIEF_NORMAL);
-#if GTK_CHECK_VERSION(3,16,0)
_labelSelect->set_xalign(0.5);
_labelSelect->set_yalign(0.5);
_labelTotalPages->set_xalign(0.5);
@@ -174,15 +173,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/)
_labelPrecisionWarning->set_yalign(0.5);
_labelPrecisionComment->set_xalign(0.5);
_labelPrecisionComment->set_yalign(0.5);
-#else
- _labelSelect->set_alignment(0.5,0.5);
- _labelTotalPages->set_alignment(0.5,0.5);
- _labelPrecision->set_alignment(0,0.5);
- _labelPrecisionWarning->set_alignment(0,0.5);
- _labelPrecisionComment->set_alignment(0.5,0.5);
-#endif
-#if GTK_CHECK_VERSION(3,12,0)
_labelSelect->set_margin_start(4);
_labelSelect->set_margin_end(4);
_labelTotalPages->set_margin_start(4);
@@ -193,18 +184,6 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/)
_labelPrecisionWarning->set_margin_end(4);
_labelPrecisionComment->set_margin_start(4);
_labelPrecisionComment->set_margin_end(4);
-#else
- _labelSelect->set_margin_left(4);
- _labelSelect->set_margin_right(4);
- _labelTotalPages->set_margin_left(4);
- _labelTotalPages->set_margin_right(4);
- _labelPrecision->set_margin_left(4);
- _labelPrecision->set_margin_right(4);
- _labelPrecisionWarning->set_margin_left(4);
- _labelPrecisionWarning->set_margin_right(4);
- _labelPrecisionComment->set_margin_left(4);
- _labelPrecisionComment->set_margin_right(4);
-#endif
_labelSelect->set_justify(Gtk::JUSTIFY_LEFT);
_labelSelect->set_line_wrap(false);
@@ -253,14 +232,8 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/)
_importViaInternal->set_active(true);
_labelViaPoppler->set_line_wrap(true);
_labelViaInternal->set_line_wrap(true);
-
-# if GTK_CHECK_VERSION(3,16,0)
_labelViaPoppler->set_xalign(0);
_labelViaInternal->set_xalign(0);
-# else
- _labelViaPoppler->set_alignment(0, 0.5);
- _labelViaInternal->set_alignment(0, 0.5);
-# endif
#endif
_fallbackPrecisionSlider->set_size_request(180,-1);
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index fed093f60..838c09d5b 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -165,11 +165,7 @@ Gtk::Widget * ParamNotebook::ParamNotebookPage::get_widget(SPDocument * doc, Ink
Gtk::Widget * widg = param->get_widget(doc, node, changeSignal);
if (widg) {
int indent = param->get_indent();
-#if GTK_CHECK_VERSION(3,12,0)
widg->set_margin_start(indent * Parameter::GUI_INDENTATION);
-#else
- widg->set_margin_left(indent * Parameter::GUI_INDENTATION);
-#endif
vbox->pack_start(*widg, false, false, 0);
gchar const * tip = param->get_tooltip();
diff --git a/src/file-update.cpp b/src/file-update.cpp
index 9f1eafd7f..9ab83a7b9 100644
--- a/src/file-update.cpp
+++ b/src/file-update.cpp
@@ -423,13 +423,9 @@ void sp_file_convert_dpi(SPDocument *doc)
moreinfo_text.set_line_wrap(true);
moreinfo_text.set_margin_bottom(20);
moreinfo_text.set_margin_top(20);
-#if GTK_CHECK_VERSION(3,12,0)
moreinfo_text.set_margin_start(30);
moreinfo_text.set_margin_end(15);
-#else
- moreinfo_text.set_margin_left(30);
- moreinfo_text.set_margin_right(15);
-#endif
+
Gtk::Box b;
b.set_border_width(0);
@@ -442,12 +438,7 @@ void sp_file_convert_dpi(SPDocument *doc)
b.set_valign(Gtk::ALIGN_START);
b.set_hexpand(false);
b.set_vexpand(false);
-
-#if GTK_CHECK_VERSION(3,12,0)
b.set_margin_start(30);
-#else
- b.set_margin_left(30);
-#endif
Gtk::Box *content = scale_dialog.get_content_area();
Gtk::Button *ok_button = scale_dialog.add_button(_("OK"), GTK_RESPONSE_ACCEPT);
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 3d4866966..72ca329ab 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -455,19 +455,13 @@ Application::add_gtk_css()
css_str += " font-family: sans-serif";
css_str += "}"; // we also can add to * but seems to me Cantarell looks better for other places
}
- // From 3.16, throws an error which we must catch.
+
try {
provider->load_from_data(css_str);
- }
-#if GTK_CHECK_VERSION(3, 16, 0)
- // Gtk::CssProviderError not defined until 3.16.
- catch (const Gtk::CssProviderError &ex) {
+ } catch (const Gtk::CssProviderError &ex) {
g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(), ex.what().c_str());
}
-#else
- catch (...) {
- }
-#endif
+
Gtk::StyleContext::add_provider_for_screen(screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
// we want a tiny file with 3 or 4 lines, so we can load without removing context
@@ -479,18 +473,12 @@ Application::add_gtk_css()
// From 3.16, throws an error which we must catch.
try {
provider->load_from_path (style);
- }
-#if GTK_CHECK_VERSION(3,16,0)
- // Gtk::CssProviderError not defined until 3.16.
- catch (const Gtk::CssProviderError& ex)
+ } catch (const Gtk::CssProviderError& ex)
{
g_critical("CSSProviderError::load_from_path(): failed to load '%s'\n(%s)",
style.c_str(), ex.what().c_str());
}
-#else
- catch (...)
- {}
-#endif
+
Gtk::StyleContext::add_provider_for_screen (screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
}
}
diff --git a/src/knot.cpp b/src/knot.cpp
index cc464c75c..abf3b1920 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -130,23 +130,12 @@ SPKnot::SPKnot(SPDesktop *desktop, gchar const *tip)
SPKnot::~SPKnot() {
auto display = gdk_display_get_default();
-
-#if GTK_CHECK_VERSION(3,20,0)
- auto seat = gdk_display_get_default_seat(display);
- auto device = gdk_seat_get_pointer(seat);
-#else
- auto dm = gdk_display_get_device_manager(display);
- auto device = gdk_device_manager_get_client_pointer(dm);
-#endif
+ auto seat = gdk_display_get_default_seat(display);
+ auto device = gdk_seat_get_pointer(seat);
if ((this->flags & SP_KNOT_GRABBED) && gdk_display_device_is_grabbed(display, device)) {
// This happens e.g. when deleting a node in node tool while dragging it
-
-#if GTK_CHECK_VERSION(3,20,0)
gdk_seat_ungrab(seat);
-#else
- gdk_device_ungrab(device, GDK_CURRENT_TIME);
-#endif
}
if (this->_event_handler_id > 0) {
@@ -253,7 +242,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
knot->setFlag(SP_KNOT_GRABBED, FALSE);
if (!nograb) {
- sp_canvas_item_ungrab(knot->item, event->button.time);
+ sp_canvas_item_ungrab(knot->item);
}
if (moved) {
@@ -332,7 +321,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
knot->setFlag(SP_KNOT_GRABBED, FALSE);
if (!nograb) {
- sp_canvas_item_ungrab(knot->item, event->button.time);
+ sp_canvas_item_ungrab(knot->item);
}
if (moved) {
diff --git a/src/live_effects/parameter/message.cpp b/src/live_effects/parameter/message.cpp
index 413c7b131..22ca479d9 100644
--- a/src/live_effects/parameter/message.cpp
+++ b/src/live_effects/parameter/message.cpp
@@ -85,13 +85,8 @@ MessageParam::param_newWidget()
Gtk::Frame * frame = new Gtk::Frame (_legend);
Gtk::Widget * widg_frame = frame->get_label_widget();
-#if GTKMM_CHECK_VERSION(3,12,0)
widg_frame->set_margin_end(_marginend);
widg_frame->set_margin_start(_marginstart);
-#else
- widg_frame->set_margin_right(_marginend);
- widg_frame->set_margin_left(_marginstart);
-#endif
_label = new Gtk::Label (message, Gtk::ALIGN_END);
_label->set_use_underline (true);
_label->set_use_markup();
@@ -100,15 +95,8 @@ MessageParam::param_newWidget()
Gtk::Widget* widg_label = dynamic_cast<Gtk::Widget *> (_label);
widg_label->set_halign(_halign);
widg_label->set_valign(_valign);
-
-#if GTKMM_CHECK_VERSION(3,12,0)
widg_label->set_margin_end(_marginend);
widg_label->set_margin_start(_marginstart);
-#else
- widg_label->set_margin_right(_marginstart);
- widg_label->set_margin_left(_marginstart);
-#endif
-
frame->add(*widg_label);
return dynamic_cast<Gtk::Widget *> (frame);
}
diff --git a/src/ui/contextmenu.cpp b/src/ui/contextmenu.cpp
index a95cb3c20..1424ba4ab 100644
--- a/src/ui/contextmenu.cpp
+++ b/src/ui/contextmenu.cpp
@@ -283,11 +283,7 @@ void ContextMenu::AppendItemFromVerb(Inkscape::Verb *verb, bool show_icon)
// Now create the label and add it to the menu item (with mnemonic)
auto const label = Gtk::manage(new Gtk::AccelLabel(action->name, true));
-#if GTKMM_CHECK_VERSION(3,16,0)
label->set_xalign(0.0);
-#else
- label->set_alignment(0.0, 0.5);
-#endif
sp_shortcut_add_accelerator(GTK_WIDGET(item->gobj()), sp_shortcut_get_primary(verb));
label->set_accel_widget(*item);
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 1246a2f89..2685b25f4 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -332,20 +332,11 @@ void DocumentProperties::build_guides()
Gtk::Label *label_gui = Gtk::manage (new Gtk::Label);
label_gui->set_markup (_("<b>Guides</b>"));
-#if GTK_CHECK_VERSION(3,12,0)
_rum_deflt.set_margin_start(0);
_rcp_bg.set_margin_start(0);
_rcp_bord.set_margin_start(0);
_rcp_gui.set_margin_start(0);
_rcp_hgui.set_margin_start(0);
-#else
- _rum_deflt.set_margin_left(0);
- _rcp_bg.set_margin_left(0);
- _rcp_bord.set_margin_left(0);
- _rcp_gui.set_margin_left(0);
- _rcp_hgui.set_margin_left(0);
-#endif
-
_rcp_gui.set_hexpand();
_rcp_hgui.set_hexpand();
_rcb_sgui.set_hexpand();
@@ -590,33 +581,21 @@ void DocumentProperties::populate_linked_profiles_box()
void DocumentProperties::external_scripts_list_button_release(GdkEventButton* event)
{
if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
-#if GTKMM_CHECK_VERSION(3,22,0)
_ExternalScriptsContextMenu.popup_at_pointer(reinterpret_cast<GdkEvent *>(event));
-#else
- _ExternalScriptsContextMenu.popup(event->button, event->time);
-#endif
}
}
void DocumentProperties::embedded_scripts_list_button_release(GdkEventButton* event)
{
if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
-#if GTKMM_CHECK_VERSION(3,22,0)
_EmbeddedScriptsContextMenu.popup_at_pointer(reinterpret_cast<GdkEvent *>(event));
-#else
- _EmbeddedScriptsContextMenu.popup(event->button, event->time);
-#endif
}
}
void DocumentProperties::linked_profiles_list_button_release(GdkEventButton* event)
{
if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
-#if GTKMM_CHECK_VERSION(3,22,0)
_EmbProfContextMenu.popup_at_pointer(reinterpret_cast<GdkEvent *>(event));
-#else
- _EmbProfContextMenu.popup(event->button, event->time);
-#endif
}
}
@@ -740,13 +719,8 @@ void DocumentProperties::build_cms()
_link_btn.set_halign(Gtk::ALIGN_CENTER);
_link_btn.set_valign(Gtk::ALIGN_CENTER);
-#if GTKMM_CHECK_VERSION(3,12,0)
_link_btn.set_margin_start(2);
_link_btn.set_margin_end(2);
-#else
- _link_btn.set_margin_left(2);
- _link_btn.set_margin_right(2);
-#endif
_page_cms->table().attach(_link_btn, 1, row, 1, 1);
_unlink_btn.set_halign(Gtk::ALIGN_CENTER);
@@ -843,14 +817,8 @@ void DocumentProperties::build_scripting()
_external_add_btn.set_halign(Gtk::ALIGN_CENTER);
_external_add_btn.set_valign(Gtk::ALIGN_CENTER);
-
-#if GTKMM_CHECK_VERSION(3,12,0)
_external_add_btn.set_margin_start(2);
_external_add_btn.set_margin_end(2);
-#else
- _external_add_btn.set_margin_left(2);
- _external_add_btn.set_margin_right(2);
-#endif
_page_external_scripts->table().attach(_external_add_btn, 1, row, 1, 1);
diff --git a/src/ui/dialog/filter-editor.cpp b/src/ui/dialog/filter-editor.cpp
index ba2c7357a..bc5d479e7 100644
--- a/src/ui/dialog/filter-editor.cpp
+++ b/src/ui/dialog/filter-editor.cpp
@@ -14,20 +14,16 @@
#include <string>
#include <gtkmm.h>
+
#include <gdkmm/display.h>
+#include <gdkmm/seat.h>
+
#include <glibmm/convert.h>
#include <glibmm/error.h>
#include <glibmm/i18n.h>
#include <glibmm/main.h>
#include <glibmm/stringutils.h>
-#if GTK_CHECK_VERSION(3, 20, 0)
-# include <gdkmm/seat.h>
-#else
-# include <gdkmm/devicemanager.h>
-#endif
-
-
#include "desktop.h"
#include "dialog-manager.h"
#include "document-undo.h"
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 13467c59a..6259c822c 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -20,16 +20,12 @@
#include <gdkmm/display.h>
#include <gdkmm/general.h>
+#include <gdkmm/seat.h>
+
#include <gtkmm/checkbutton.h>
#include <gtkmm/colorbutton.h>
#include <gtkmm/eventbox.h>
#include <gtkmm/sizegroup.h>
-#if GTK_CHECK_VERSION(3, 20, 0)
-# include <gdkmm/seat.h>
-#else
-# include <gdkmm/devicemanager.h>
-#endif
-
#include <glibmm/i18n.h>
#include <glibmm/stringutils.h>
@@ -1628,11 +1624,7 @@ void FilterEffectsDialog::FilterModifier::filter_list_button_release(GdkEventBut
items[0]->set_sensitive(sensitive);
items[1]->set_sensitive(sensitive);
-#if GTKMM_CHECK_VERSION(3,22,0)
_menu->popup_at_pointer(reinterpret_cast<GdkEvent *>(event));
-#else
- _menu->popup(event->button, event->time);
-#endif
}
}
@@ -2000,13 +1992,8 @@ bool FilterEffectsDialog::PrimitiveList::on_draw_signal(const Cairo::RefPtr<Cair
Gdk::ModifierType mask;
auto display = get_bin_window()->get_display();
-#if GTK_CHECK_VERSION(3, 20, 0)
auto seat = display->get_default_seat();
auto device = seat->get_pointer();
-#else
- auto dm = display->get_device_manager();
- auto device = dm->get_client_pointer();
-#endif
cairo_set_line_width (cr->cobj(),0.5);
get_bin_window()->get_device_position(device, mx, my, mask);
@@ -2494,11 +2481,7 @@ bool FilterEffectsDialog::PrimitiveList::on_button_release_event(GdkEventButton*
items[0]->set_sensitive(sensitive);
items[1]->set_sensitive(sensitive);
-#if GTKMM_CHECK_VERSION(3,22,0)
_primitive_menu->popup_at_pointer(reinterpret_cast<GdkEvent *>(e));
-#else
- _primitive_menu->popup(e->button, e->time);
-#endif
return true;
}
diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index 241448898..03743b85a 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -210,11 +210,7 @@ void GuidelinePropertiesDialog::_setup() {
_color.set_halign(Gtk::ALIGN_FILL);
_color.set_valign(Gtk::ALIGN_FILL);
_color.set_hexpand();
-#if GTKMM_CHECK_VERSION(3,12,0)
_color.set_margin_end(6);
-#else
- _color.set_margin_right(6);
-#endif
_layout_table.attach(_color, 1, 3, 2, 1);
// unitmenus
@@ -246,11 +242,7 @@ void GuidelinePropertiesDialog::_setup() {
_unit_menu.set_halign(Gtk::ALIGN_FILL);
_unit_menu.set_valign(Gtk::ALIGN_FILL);
-#if GTKMM_CHECK_VERSION(3,12,0)
_unit_menu.set_margin_end(6);
-#else
- _unit_menu.set_margin_right(6);
-#endif
_layout_table.attach(_unit_menu, 2, 4, 1, 1);
// angle spinbutton
@@ -267,22 +259,14 @@ void GuidelinePropertiesDialog::_setup() {
_relative_toggle.set_halign(Gtk::ALIGN_FILL);
_relative_toggle.set_valign(Gtk::ALIGN_FILL);
_relative_toggle.set_hexpand();
-#if GTKMM_CHECK_VERSION(3,12,0)
_relative_toggle.set_margin_start(6);
-#else
- _relative_toggle.set_margin_left(6);
-#endif
_layout_table.attach(_relative_toggle, 1, 7, 2, 1);
// locked radio button
_locked_toggle.set_halign(Gtk::ALIGN_FILL);
_locked_toggle.set_valign(Gtk::ALIGN_FILL);
_locked_toggle.set_hexpand();
-#if GTKMM_CHECK_VERSION(3,12,0)
_locked_toggle.set_margin_start(6);
-#else
- _locked_toggle.set_margin_left(6);
-#endif
_layout_table.attach(_locked_toggle, 1, 8, 2, 1);
_relative_toggle.signal_toggled().connect(sigc::mem_fun(*this, &GuidelinePropertiesDialog::_modeChanged));
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index d901c1f1c..c89f58cef 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -114,10 +114,8 @@ InkscapePreferences::InkscapePreferences()
hbox_list_page->pack_start(*list_frame, false, true, 0);
_page_list.set_headers_visible(false);
scrolled_window->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
-#if GTKMM_CHECK_VERSION(3,22,0)
scrolled_window->set_propagate_natural_width();
scrolled_window->set_propagate_natural_height();
-#endif
scrolled_window->add(_page_list);
list_frame->set_shadow_type(Gtk::SHADOW_IN);
list_frame->add(*scrolled_window);
@@ -134,10 +132,8 @@ InkscapePreferences::InkscapePreferences()
Gtk::ScrolledWindow* pageScroller = Gtk::manage(new Gtk::ScrolledWindow());
pageScroller->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
-#if GTKMM_CHECK_VERSION(3,22,0)
pageScroller->set_propagate_natural_width();
pageScroller->set_propagate_natural_height();
-#endif
pageScroller->add(*vbox_page);
hbox_list_page->pack_start(*pageScroller, true, true, 0);
@@ -162,29 +158,7 @@ InkscapePreferences::InkscapePreferences()
//calculate the size request for this dialog
_page_list.expand_all();
-#if GTKMM_CHECK_VERSION(3,22,0)
- _page_list_model->foreach_iter(sigc::mem_fun(*this, &InkscapePreferences::GetSizeRequest));
-#else
- // we don't have Gtk::ScrolledWindow::set_propagate_natural_width/height so work around it:
- // -> store current policy
- Gtk::PolicyType scrolled_window_h, scrolled_window_v,
- pageScroller_h, pageScroller_v;
- scrolled_window->get_policy(scrolled_window_h, scrolled_window_v);
- pageScroller->get_policy(pageScroller_h, pageScroller_v);
- // -> calculate minimum size with current policy
- _page_list_model->foreach_iter(sigc::mem_fun(*this, &InkscapePreferences::GetSizeRequest));
- int minimum_width = _minimum_width;
- int minimum_height = _minimum_height;
- // -> calculate natural size with Gtk::POLICY_NEVER (i.e. no scrollbars)
- scrolled_window->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_NEVER);
- pageScroller->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_NEVER);
_page_list_model->foreach_iter(sigc::mem_fun(*this, &InkscapePreferences::GetSizeRequest));
- // -> reset policy to previously stored values and reset minimum size to reasonable values as stored above
- scrolled_window->set_policy(scrolled_window_h, scrolled_window_v);
- pageScroller->set_policy(pageScroller_h, pageScroller_v);
- _minimum_width = minimum_width;
- _minimum_height = minimum_height;
-#endif
_page_list.collapse_all();
}
@@ -661,19 +635,13 @@ void InkscapePreferences::symbolicDefaultColor(){
} else {
css_str += "*{-gtk-icon-style: regular;}";
}
- // From 3.16, throws an error which we must catch.
+
try {
provider->load_from_data(css_str);
- }
-#if GTK_CHECK_VERSION(3, 16, 0)
- // Gtk::CssProviderError not defined until 3.16.
- catch (const Gtk::CssProviderError &ex) {
+ } catch (const Gtk::CssProviderError &ex) {
g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(), ex.what().c_str());
}
-#else
- catch (...) {
- }
-#endif
+
Gtk::StyleContext::add_provider_for_screen(screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
}
@@ -717,19 +685,13 @@ void InkscapePreferences::symbolicAddClass()
css_str += ".iconcolornamedinverse, .colornamedinverse image{ color:";
css_str += colornamed_inverse;
css_str += ";}";
- // From 3.16, throws an error which we must catch.
+
try {
provider->load_from_data(css_str);
- }
-#if GTK_CHECK_VERSION(3, 16, 0)
- // Gtk::CssProviderError not defined until 3.16.
- catch (const Gtk::CssProviderError &ex) {
+ } catch (const Gtk::CssProviderError &ex) {
g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(), ex.what().c_str());
}
-#else
- catch (...) {
- }
-#endif
+
Gtk::StyleContext::add_provider_for_screen(screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
// we want a tiny file with 3 or 4 lines, so we can load without removing context
// is more understandable than record previously applied
@@ -737,20 +699,13 @@ void InkscapePreferences::symbolicAddClass()
if (!style.empty()) {
auto provider = Gtk::CssProvider::create();
- // From 3.16, throws an error which we must catch.
try {
provider->load_from_path(style);
- }
-#if GTK_CHECK_VERSION(3, 16, 0)
- // Gtk::CssProviderError not defined until 3.16.
- catch (const Gtk::CssProviderError &ex) {
+ } catch (const Gtk::CssProviderError &ex) {
g_critical("CSSProviderError::load_from_path(): failed to load '%s'\n(%s)", style.c_str(),
ex.what().c_str());
}
-#else
- catch (...) {
- }
-#endif
+
Gtk::StyleContext::add_provider_for_screen(screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
}
}
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
index 654044fee..29cb57286 100644
--- a/src/ui/dialog/input.cpp
+++ b/src/ui/dialog/input.cpp
@@ -608,15 +608,8 @@ InputDialogImpl::InputDialogImpl() :
testThumb.set(getPix(PIX_TABLET));
testThumb.set_margin_top(24);
testThumb.set_margin_bottom(24);
-
-#if GTK_CHECK_VERSION(3,12,0)
testThumb.set_margin_start(24);
testThumb.set_margin_end(24);
-#else
- testThumb.set_margin_left(24);
- testThumb.set_margin_right(24);
-#endif
-
testThumb.set_hexpand();
testThumb.set_vexpand();
imageTable.attach(testThumb, 0, 0, 8, 1);
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 449d6be1a..1e2a6ea35 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -156,11 +156,7 @@ Gtk::MenuItem& LayersPanel::_addPopupItem( SPDesktop *desktop, unsigned int code
}
Gtk::Label *menu_label = Gtk::manage(new Gtk::Label(label, true));
-#if GTKMM_CHECK_VERSION(3,16,0)
menu_label->set_xalign(0.0);
-#else
- menu_label->set_alignment(0.0, 0.5);
-#endif
box->pack_start(*menu_label, true, true, 0);
item->add(*box);
item->show_all();
@@ -557,11 +553,7 @@ bool LayersPanel::_handleButtonEvent(GdkEventButton* event)
if ( _tree.get_path_at_pos( x, y, path ) ) {
_checkTreeSelection();
-#if GTKMM_CHECK_VERSION(3,22,0)
_popupMenu.popup_at_pointer(reinterpret_cast<GdkEvent *>(event));
-#else
- _popupMenu.popup(event->button, event->time);
-#endif
}
}
diff --git a/src/ui/dialog/new-from-template.cpp b/src/ui/dialog/new-from-template.cpp
index 69423d988..bfccdb627 100644
--- a/src/ui/dialog/new-from-template.cpp
+++ b/src/ui/dialog/new-from-template.cpp
@@ -30,12 +30,7 @@ NewFromTemplate::NewFromTemplate()
_create_template_button.set_halign(Gtk::ALIGN_END);
_create_template_button.set_valign(Gtk::ALIGN_END);
-
-#if GTKMM_CHECK_VERSION(3,12,0)
_create_template_button.set_margin_end(15);
-#else
- _create_template_button.set_margin_right(15);
-#endif
get_content_area()->pack_end(_create_template_button, Gtk::PACK_SHRINK);
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index be357737b..606539797 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -286,11 +286,7 @@ Gtk::MenuItem& ObjectsPanel::_addPopupItem( SPDesktop *desktop, unsigned int cod
}
Gtk::Label *menu_label = Gtk::manage(new Gtk::Label(label, true));
-#if GTKMM_CHECK_VERSION(3,16,0)
menu_label->set_xalign(0.0);
-#else
- menu_label->set_alignment(0.0, 0.5);
-#endif
box->pack_start(*menu_label, true, true, 0);
item->add(*box);
item->show_all();
@@ -786,12 +782,7 @@ bool ObjectsPanel::_handleButtonEvent(GdkEventButton* event)
int y = static_cast<int>(event->y);
if ( _tree.get_path_at_pos( x, y, path ) ) {
_checkTreeSelection();
-
-#if GTKMM_CHECK_VERSION(3,22,0)
_popupMenu.popup_at_pointer(reinterpret_cast<GdkEvent *>(event));
-#else
- _popupMenu.popup(event->button, event->time);
-#endif
if (_tree.get_selection()->is_selected(path)) {
return true;
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index ee89ddd86..2d9331818 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -280,33 +280,21 @@ void SvgFontsDialog::on_kerning_value_changed(){
void SvgFontsDialog::glyphs_list_button_release(GdkEventButton* event)
{
if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
-#if GTKMM_CHECK_VERSION(3,22,0)
_GlyphsContextMenu.popup_at_pointer(reinterpret_cast<GdkEvent *>(event));
-#else
- _GlyphsContextMenu.popup(event->button, event->time);
-#endif
}
}
void SvgFontsDialog::kerning_pairs_list_button_release(GdkEventButton* event)
{
if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
-#if GTKMM_CHECK_VERSION(3,22,0)
_KerningPairsContextMenu.popup_at_pointer(reinterpret_cast<GdkEvent *>(event));
-#else
- _KerningPairsContextMenu.popup(event->button, event->time);
-#endif
}
}
void SvgFontsDialog::fonts_list_button_release(GdkEventButton* event)
{
if((event->type == GDK_BUTTON_RELEASE) && (event->button == 3)) {
-#if GTKMM_CHECK_VERSION(3,22,0)
_FontsContextMenu.popup_at_pointer(reinterpret_cast<GdkEvent *>(event));
-#else
- _FontsContextMenu.popup(event->button, event->time);
-#endif
}
}
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 7884e39f0..d3fb6de93 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -355,12 +355,7 @@ bool colorItemHandleButtonPress(GdkEventButton* event, UI::Widget::Preview *prev
}
}
gtk_widget_set_sensitive( popupSubHolder, processed );
-
-#if GTK_CHECK_VERSION(3,22,0)
gtk_menu_popup_at_pointer(GTK_MENU(popupMenu), reinterpret_cast<GdkEvent *>(event));
-#else
- gtk_menu_popup(GTK_MENU(popupMenu), NULL, NULL, NULL, NULL, event->button, event->time);
-#endif
handled = TRUE;
}
}
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index fe7ce6a44..d4b48258d 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -117,14 +117,8 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
/******************** Table *************************/
auto table = new Gtk::Grid();
-#if GTKMM_CHECK_VERSION(3,12,0)
table->set_margin_start(3);
table->set_margin_end(3);
-#else
- table->set_margin_left(3);
- table->set_margin_right(3);
-#endif
-
table->set_margin_top(4);
// panel is a cloked Gtk::VBox
_getContents()->pack_start(*Gtk::manage(table), Gtk::PACK_EXPAND_WIDGET);
@@ -200,7 +194,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
scroller->add(*Gtk::manage(icon_view));
scroller->set_hexpand();
scroller->set_vexpand();
-#if GTKMM_CHECK_VERSION(3,14,0)
+
overlay = new Gtk::Overlay();
overlay->set_hexpand();
overlay->set_vexpand();
@@ -238,9 +232,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
overlay->add_overlay(* overlay_icon);
overlay->add_overlay(* overlay_title);
overlay->add_overlay(* overlay_desc);
-#else
- table->attach(*Gtk::manage(scroller),0,row,2,1);
-#endif
+
previous_height = 0;
++row;
@@ -251,14 +243,8 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
progress->pack_start(* progress_bar, Gtk::PACK_EXPAND_WIDGET);
progress->set_margin_top(15);
progress->set_margin_bottom(15);
-
-#if GTKMM_CHECK_VERSION(3,12,0)
progress->set_margin_start(20);
progress->set_margin_end(20);
-#else
- progress->set_margin_left(20);
- progress->set_margin_right(20);
-#endif
++row;
@@ -459,7 +445,6 @@ void SymbolsDialog::rebuild() {
}
}
void SymbolsDialog::showOverlay() {
-#if GTKMM_CHECK_VERSION(3,14,0)
Glib::ustring current = Glib::Markup::escape_text(symbol_set->get_active_text());
if (current == ALLDOCS && !l.size())
{
@@ -507,17 +492,15 @@ void SymbolsDialog::showOverlay() {
overlay_title->hide();
overlay_desc->hide();
}
-#endif
}
void SymbolsDialog::hideOverlay() {
-#if GTKMM_CHECK_VERSION(3,14,0)
overlay_opacity->hide();
overlay_icon->hide();
overlay_title->hide();
overlay_desc->hide();
-#endif
}
+
void SymbolsDialog::insertSymbol() {
Inkscape::Verb *verb = Inkscape::Verb::get( SP_VERB_EDIT_SYMBOL );
SPAction *action = verb->get_action(Inkscape::ActionContext( (Inkscape::UI::View::View *) current_desktop) );
diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h
index d4a26ee14..bf52369cc 100644
--- a/src/ui/dialog/symbols.h
+++ b/src/ui/dialog/symbols.h
@@ -136,9 +136,7 @@ private:
Gtk::Button* more;
Gtk::Button* fewer;
Gtk::HBox* tools;
-#if GTKMM_CHECK_VERSION(3,14,0)
Gtk::Overlay* overlay;
-#endif
Gtk::Image* overlay_icon;
Gtk::Image* overlay_opacity;
Gtk::Label* overlay_title;
diff --git a/src/ui/event-debug.h b/src/ui/event-debug.h
index c6f979c1f..150b84746 100644
--- a/src/ui/event-debug.h
+++ b/src/ui/event-debug.h
@@ -81,20 +81,12 @@ inline void ui_dump_event (GdkEvent *event, Glib::ustring const &prefix, bool me
case GDK_TOUCH_CANCEL:
std::cout << "GDK_TOUCH_CANCEL" << std::endl;
break;
-
-#if GTK_CHECK_VERSION(3,18,0)
-
case GDK_TOUCHPAD_SWIPE:
std::cout << "GDK_TOUCHPAD_SWIPE" << std::endl;
break;
case GDK_TOUCHPAD_PINCH:
std::cout << "GDK_TOUCHPAD_PINCH" << std::endl;
break;
-
-#endif
-
-#if GTK_CHECK_VERSION(3,22,0)
-
case GDK_PAD_BUTTON_PRESS:
std::cout << "GDK_PAD_BUTTON_PRESS" << std::endl;
break;
@@ -110,9 +102,6 @@ inline void ui_dump_event (GdkEvent *event, Glib::ustring const &prefix, bool me
case GDK_PAD_GROUP_MODE:
std::cout << "GDK_PAD_GROUP_MODE" << std::endl;
break;
-
-#endif
-
default:
std::cout << "GDK event not recognized!" << std::endl;
break;
diff --git a/src/ui/monitor.cpp b/src/ui/monitor.cpp
index df9a1ac15..a9a3f8398 100644
--- a/src/ui/monitor.cpp
+++ b/src/ui/monitor.cpp
@@ -10,25 +10,18 @@
* Released under GNU GPL v2+, read the file 'COPYING' for more information.
*/
+#include <gdkmm/monitor.h>
#include <gdkmm/rectangle.h>
#include <gdkmm/window.h>
#include "include/gtkmm_version.h"
-#if GTKMM_CHECK_VERSION(3,22,0)
-# include <gdkmm/monitor.h>
-#else
-# include <gdkmm/screen.h>
-#endif
-
-
namespace Inkscape {
namespace UI {
/** get monitor geometry of primary monitor */
Gdk::Rectangle get_monitor_geometry_primary() {
Gdk::Rectangle monitor_geometry;
-#if GTKMM_CHECK_VERSION(3,22,0)
auto const display = Gdk::Display::get_default();
auto monitor = display->get_primary_monitor();
@@ -38,41 +31,24 @@ Gdk::Rectangle get_monitor_geometry_primary() {
}
monitor->get_geometry(monitor_geometry);
-#else
- auto const default_screen = Gdk::Screen::get_default();
- auto const monitor_number = default_screen->get_primary_monitor();
- default_screen->get_monitor_geometry(monitor_number, monitor_geometry);
-#endif
return monitor_geometry;
}
/** get monitor geometry of monitor containing largest part of window */
Gdk::Rectangle get_monitor_geometry_at_window(const Glib::RefPtr<Gdk::Window>& window) {
Gdk::Rectangle monitor_geometry;
-#if GTKMM_CHECK_VERSION(3,22,0)
auto const display = Gdk::Display::get_default();
auto const monitor = display->get_monitor_at_window(window);
monitor->get_geometry(monitor_geometry);
-#else
- auto const default_screen = Gdk::Screen::get_default();
- auto const monitor_number = default_screen->get_monitor_at_window(window);
- default_screen->get_monitor_geometry(monitor_number, monitor_geometry);
-#endif
return monitor_geometry;
}
/** get monitor geometry of monitor at (or closest to) point on combined screen area */
Gdk::Rectangle get_monitor_geometry_at_point(int x, int y) {
Gdk::Rectangle monitor_geometry;
-#if GTKMM_CHECK_VERSION(3,22,0)
auto const display = Gdk::Display::get_default();
auto const monitor = display->get_monitor_at_point(x ,y);
monitor->get_geometry(monitor_geometry);
-#else
- auto const default_screen = Gdk::Screen::get_default();
- auto const monitor_number = default_screen->get_monitor_at_point(x, y);
- default_screen->get_monitor_geometry(monitor_number, monitor_geometry);
-#endif
return monitor_geometry;
}
diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp
index 33ac6f062..1e15d054d 100644
--- a/src/ui/previewholder.cpp
+++ b/src/ui/previewholder.cpp
@@ -56,11 +56,9 @@ PreviewHolder::PreviewHolder() :
_scroller->set_vexpand();
_scroller->add( *_insides );
-#if GTK_CHECK_VERSION(3,16,0)
// Disable overlay scrolling as the scrollbar covers up swatches.
// For some reason this also makes the height 55px.
_scroller->set_overlay_scrolling(false);
-#endif
add(*_scroller);
}
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index f47951c2c..c6f18f2c6 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -339,7 +339,7 @@ bool ControlPoint::_eventHandler(Inkscape::UI::Tools::ToolBase *event_context, G
sp_event_context_snap_watchdog_callback(event_context->_delayed_snap_event);
}
- sp_canvas_item_ungrab(_canvas_item, event->button.time);
+ sp_canvas_item_ungrab(_canvas_item);
_setMouseover(this, event->button.state);
_event_grab = false;
@@ -419,7 +419,7 @@ bool ControlPoint::_eventHandler(Inkscape::UI::Tools::ToolBase *event_context, G
dragged(new_pos, &fake);
- sp_canvas_item_ungrab(_canvas_item, event->key.time);
+ sp_canvas_item_ungrab(_canvas_item);
_clearMouseover(); // this will also reset state to normal
_desktop->canvas->endForcedFullRedraws();
_event_grab = false;
@@ -535,7 +535,7 @@ void ControlPoint::transferGrab(ControlPoint *prev_point, GdkEventMotion *event)
if (!_event_grab) return;
grabbed(event);
- sp_canvas_item_ungrab(prev_point->_canvas_item, event->time);
+ sp_canvas_item_ungrab(prev_point->_canvas_item);
sp_canvas_item_grab(_canvas_item, _grab_event_mask, nullptr, event->time);
if (!_drag_initiated) {
diff --git a/src/ui/toolbar/arc-toolbar.cpp b/src/ui/toolbar/arc-toolbar.cpp
index 751efaa80..d25274474 100644
--- a/src/ui/toolbar/arc-toolbar.cpp
+++ b/src/ui/toolbar/arc-toolbar.cpp
@@ -402,11 +402,6 @@ ArcToolbar::defaults()
_start_adj->set_value(0.0);
_end_adj->set_value(0.0);
-#if !GTK_CHECK_VERSION(3,18,0)
- _start_adj->value_changed();
- _end_adj->value_changed();
-#endif
-
if(_desktop->canvas) gtk_widget_grab_focus(GTK_WIDGET(_desktop->canvas));
}
@@ -514,11 +509,6 @@ ArcToolbar::event_attr_changed(Inkscape::XML::Node *repr, gchar const * /*name*/
gdouble ry = ge->getVisibleRy();
toolbar->_rx_adj->set_value(Quantity::convert(rx, "px", unit));
toolbar->_ry_adj->set_value(Quantity::convert(ry, "px", unit));
-
-#if !GTK_CHECK_VERSION(3,18,0)
- toolbar->_rx_adj->value_changed();
- toolbar->_ry_adj->value_changed();
-#endif
}
gdouble start = 0.;
diff --git a/src/ui/toolbar/connector-toolbar.cpp b/src/ui/toolbar/connector-toolbar.cpp
index c10cb394d..4375350ef 100644
--- a/src/ui/toolbar/connector-toolbar.cpp
+++ b/src/ui/toolbar/connector-toolbar.cpp
@@ -418,10 +418,6 @@ ConnectorToolbar::event_attr_changed(Inkscape::XML::Node *repr,
toolbar->_spacing_adj->set_value(spacing);
-#if !GTK_CHECK_VERSION(3,18,0)
- toolbar->_spacing_adj->value_changed();
-#endif
-
if(toolbar->_desktop->canvas) gtk_widget_grab_focus(GTK_WIDGET(toolbar->_desktop->canvas));
}
}
diff --git a/src/ui/toolbar/rect-toolbar.cpp b/src/ui/toolbar/rect-toolbar.cpp
index a8b49e62d..44a53c8fc 100644
--- a/src/ui/toolbar/rect-toolbar.cpp
+++ b/src/ui/toolbar/rect-toolbar.cpp
@@ -264,12 +264,6 @@ RectToolbar::defaults()
_rx_adj->set_value(0.0);
_ry_adj->set_value(0.0);
-#if !GTK_CHECK_VERSION(3,18,0)
- // this is necessary if the previous value was 0, but we still need to run the callback to change all selected objects
- _rx_adj->value_changed();
- _ry_adj->value_changed();
-#endif
-
sensitivize();
}
diff --git a/src/ui/toolbar/spiral-toolbar.cpp b/src/ui/toolbar/spiral-toolbar.cpp
index 88e582b0b..35981c1da 100644
--- a/src/ui/toolbar/spiral-toolbar.cpp
+++ b/src/ui/toolbar/spiral-toolbar.cpp
@@ -213,12 +213,6 @@ SpiralToolbar::defaults()
_expansion_adj->set_value(exp);
_t0_adj->set_value(t0);
-#if !GTK_CHECK_VERSION(3,18,0)
- _revolution_adj->value_changed();
- _expansion_adj->value_changed();
- _t0_adj->value_changed();
-#endif
-
if(_desktop->canvas) gtk_widget_grab_focus(GTK_WIDGET(_desktop->canvas));
}
diff --git a/src/ui/toolbar/star-toolbar.cpp b/src/ui/toolbar/star-toolbar.cpp
index 13a295e5d..a2d09f9aa 100644
--- a/src/ui/toolbar/star-toolbar.cpp
+++ b/src/ui/toolbar/star-toolbar.cpp
@@ -437,13 +437,6 @@ StarToolbar::defaults()
_spoke_adj->set_value(prop);
_roundedness_adj->set_value(rounded);
_randomization_adj->set_value(randomized);
-
-#if !GTK_CHECK_VERSION(3,18,0)
- _magnitude_adj->value_changed();
- _spoke_adj->value_changed();
- _roundedness_adj->value_changed();
- _randomization_adj->value_changed();
-#endif
}
void
diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index 14fe72bdd..835681745 100644
--- a/src/ui/tools/arc-tool.cpp
+++ b/src/ui/tools/arc-tool.cpp
@@ -67,7 +67,7 @@ ArcTool::ArcTool()
}
void ArcTool::finish() {
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
this->finishItem();
this->sel_changed_connection.disconnect();
@@ -225,7 +225,7 @@ bool ArcTool::root_handler(GdkEvent* event) {
this->item_to_select = nullptr;
handled = true;
}
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
break;
case GDK_KEY_PRESS:
@@ -266,7 +266,7 @@ bool ArcTool::root_handler(GdkEvent* event) {
case GDK_KEY_space:
if (dragging) {
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
dragging = false;
sp_event_context_discard_delayed_snap_event(this);
@@ -454,7 +454,7 @@ void ArcTool::finishItem() {
void ArcTool::cancel() {
desktop->getSelection()->clear();
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), 0);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
if (this->arc != nullptr) {
this->arc->deleteObject();
diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
index 9df0ef34e..967c1de63 100644
--- a/src/ui/tools/box3d-tool.cpp
+++ b/src/ui/tools/box3d-tool.cpp
@@ -70,7 +70,7 @@ Box3dTool::Box3dTool()
}
void Box3dTool::finish() {
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
this->finishItem();
this->sel_changed_connection.disconnect();
@@ -336,8 +336,7 @@ bool Box3dTool::root_handler(GdkEvent* event) {
this->item_to_select = nullptr;
ret = TRUE;
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
- event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
}
break;
@@ -459,8 +458,7 @@ bool Box3dTool::root_handler(GdkEvent* event) {
case GDK_KEY_space:
if (dragging) {
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
- event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
dragging = false;
sp_event_context_discard_delayed_snap_event(this);
if (!this->within_tolerance) {
diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp
index 37a4a24f0..ac9db6f0d 100644
--- a/src/ui/tools/calligraphic-tool.cpp
+++ b/src/ui/tools/calligraphic-tool.cpp
@@ -425,7 +425,7 @@ void CalligraphicTool::cancel() {
this->dragging = false;
this->is_drawing = false;
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), 0);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
/* Remove all temporary line segments */
for (auto i:this->segments)
@@ -727,7 +727,7 @@ bool CalligraphicTool::root_handler(GdkEvent* event) {
Geom::Point const motion_w(event->button.x, event->button.y);
Geom::Point const motion_dt(desktop->w2d(motion_w));
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
desktop->canvas->endForcedFullRedraws();
this->is_drawing = false;
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index 99d92b58a..504232967 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -109,7 +109,7 @@ void DropperTool::finish() {
this->enableGrDrag(false);
if (this->grabbed) {
- sp_canvas_item_ungrab(this->grabbed, GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(this->grabbed);
this->grabbed = nullptr;
}
@@ -295,7 +295,7 @@ bool DropperTool::root_handler(GdkEvent* event) {
this->dragging = false;
if (this->grabbed) {
- sp_canvas_item_ungrab(this->grabbed, event->button.time);
+ sp_canvas_item_ungrab(this->grabbed);
this->grabbed = nullptr;
}
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index eaad1cee4..9e306dec7 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -364,7 +364,7 @@ void EraserTool::cancel() {
SPDesktop *desktop = SP_EVENT_CONTEXT(this)->desktop;
this->dragging = FALSE;
this->is_drawing = false;
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), 0);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
/* Remove all temporary line segments */
for (auto i : this->segments)
sp_canvas_item_destroy(SP_CANVAS_ITEM(i));
@@ -459,7 +459,7 @@ bool EraserTool::root_handler(GdkEvent* event) {
Geom::Point const motion_w(event->button.x, event->button.y);
Geom::Point const motion_dt(desktop->w2d(motion_w));
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
desktop->canvas->endForcedFullRedraws();
this->is_drawing = false;
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index c211fc8ec..4f9db3e2b 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -103,7 +103,7 @@ FreehandBase::FreehandBase(gchar const *const *cursor_shape)
FreehandBase::~FreehandBase() {
if (this->grab) {
- sp_canvas_item_ungrab(this->grab, GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(this->grab);
this->grab = nullptr;
}
@@ -160,7 +160,7 @@ void FreehandBase::finish() {
this->sel_modified_connection.disconnect();
if (this->grab) {
- sp_canvas_item_ungrab(this->grab, GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(this->grab);
}
if (this->selection) {
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index e2dae85a5..6633cdd64 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -491,7 +491,7 @@ void MeasureTool::finish()
this->enableGrDrag(false);
if (this->grabbed) {
- sp_canvas_item_ungrab(this->grabbed, GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(this->grabbed);
this->grabbed = nullptr;
}
@@ -655,7 +655,7 @@ bool MeasureTool::root_handler(GdkEvent* event)
showCanvasItems();
if (this->grabbed) {
- sp_canvas_item_ungrab(this->grabbed, event->button.time);
+ sp_canvas_item_ungrab(this->grabbed);
this->grabbed = nullptr;
}
break;
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 8ba3a8d7b..726703ebd 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -814,7 +814,7 @@ bool PenTool::_handleButtonRelease(GdkEventButton const &revent) {
}
if (this->grab) {
// Release grab now
- sp_canvas_item_ungrab(this->grab, revent.time);
+ sp_canvas_item_ungrab(this->grab);
this->grab = nullptr;
}
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index cbcba16b5..812027d58 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -506,7 +506,7 @@ bool PencilTool::_handleButtonRelease(GdkEventButton const &revent) {
if (this->grab) {
/* Release grab now */
- sp_canvas_item_ungrab(this->grab, revent.time);
+ sp_canvas_item_ungrab(this->grab);
this->grab = nullptr;
}
@@ -518,7 +518,7 @@ bool PencilTool::_handleButtonRelease(GdkEventButton const &revent) {
void PencilTool::_cancel() {
if (this->grab) {
/* Release grab now */
- sp_canvas_item_ungrab(this->grab, 0);
+ sp_canvas_item_ungrab(this->grab);
this->grab = nullptr;
}
diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp
index be4b49dce..93f9cb5f8 100644
--- a/src/ui/tools/rect-tool.cpp
+++ b/src/ui/tools/rect-tool.cpp
@@ -66,7 +66,7 @@ RectTool::RectTool()
}
void RectTool::finish() {
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(this->desktop->acetate), GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(this->desktop->acetate));
this->finishItem();
this->sel_changed_connection.disconnect();
@@ -259,8 +259,7 @@ bool RectTool::root_handler(GdkEvent* event) {
this->item_to_select = nullptr;
ret = TRUE;
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
- event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
}
break;
case GDK_KEY_PRESS:
@@ -308,8 +307,7 @@ bool RectTool::root_handler(GdkEvent* event) {
case GDK_KEY_space:
if (dragging) {
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
- event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
dragging = false;
sp_event_context_discard_delayed_snap_event(this);
@@ -476,7 +474,7 @@ void RectTool::finishItem() {
void RectTool::cancel(){
this->desktop->getSelection()->clear();
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(this->desktop->acetate), 0);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(this->desktop->acetate));
if (this->rect != nullptr) {
this->rect->deleteObject();
diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index 44968887a..88b432004 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -127,7 +127,7 @@ SelectTool::~SelectTool() {
this->enableGrDrag(false);
if (this->grabbed) {
- sp_canvas_item_ungrab(this->grabbed, GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(this->grabbed);
this->grabbed = nullptr;
}
@@ -318,7 +318,7 @@ bool SelectTool::item_handler(SPItem* item, GdkEvent* event) {
rb_escaped = drag_escaped = 0;
if (this->grabbed) {
- sp_canvas_item_ungrab(this->grabbed, event->button.time);
+ sp_canvas_item_ungrab(this->grabbed);
this->grabbed = nullptr;
}
@@ -521,7 +521,7 @@ bool SelectTool::root_handler(GdkEvent* event) {
Inkscape::Rubberband::get(desktop)->start(desktop, p);
if (this->grabbed) {
- sp_canvas_item_ungrab(this->grabbed, event->button.time);
+ sp_canvas_item_ungrab(this->grabbed);
this->grabbed = nullptr;
}
@@ -793,7 +793,7 @@ bool SelectTool::root_handler(GdkEvent* event) {
}
if (this->grabbed) {
- sp_canvas_item_ungrab(this->grabbed, event->button.time);
+ sp_canvas_item_ungrab(this->grabbed);
this->grabbed = nullptr;
}
diff --git a/src/ui/tools/spiral-tool.cpp b/src/ui/tools/spiral-tool.cpp
index 3d3845987..dd4a839e4 100644
--- a/src/ui/tools/spiral-tool.cpp
+++ b/src/ui/tools/spiral-tool.cpp
@@ -67,7 +67,7 @@ SpiralTool::SpiralTool()
void SpiralTool::finish() {
SPDesktop *desktop = this->desktop;
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
this->finishItem();
this->sel_changed_connection.disconnect();
@@ -232,7 +232,7 @@ bool SpiralTool::root_handler(GdkEvent* event) {
this->item_to_select = nullptr;
ret = TRUE;
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
}
break;
@@ -271,8 +271,7 @@ bool SpiralTool::root_handler(GdkEvent* event) {
case GDK_KEY_space:
if (dragging) {
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
- event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
dragging = false;
sp_event_context_discard_delayed_snap_event(this);
@@ -408,7 +407,7 @@ void SpiralTool::finishItem() {
void SpiralTool::cancel() {
this->desktop->getSelection()->clear();
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(this->desktop->acetate), 0);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(this->desktop->acetate));
if (this->spiral != nullptr) {
this->spiral->deleteObject();
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index 2e92d1ae9..a6a143ec0 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -68,7 +68,7 @@ StarTool::StarTool()
}
void StarTool::finish() {
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
this->finishItem();
this->sel_changed_connection.disconnect();
@@ -241,7 +241,7 @@ bool StarTool::root_handler(GdkEvent* event) {
this->item_to_select = nullptr;
ret = TRUE;
- sp_canvas_item_ungrab(SP_CANVAS_ITEM (desktop->acetate), event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM (desktop->acetate));
}
break;
@@ -280,7 +280,7 @@ bool StarTool::root_handler(GdkEvent* event) {
case GDK_KEY_space:
if (dragging) {
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
dragging = false;
@@ -426,7 +426,7 @@ void StarTool::finishItem() {
void StarTool::cancel() {
desktop->getSelection()->clear();
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), 0);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
if (this->star != nullptr) {
this->star->deleteObject();
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index f27f37300..18fefa508 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -109,7 +109,7 @@ TextTool::~TextTool() {
this->shape_editor = nullptr;
if (this->grabbed) {
- sp_canvas_item_ungrab(this->grabbed, GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(this->grabbed);
this->grabbed = nullptr;
}
@@ -611,7 +611,7 @@ bool TextTool::root_handler(GdkEvent* event) {
m.unSetup();
if (this->grabbed) {
- sp_canvas_item_ungrab(this->grabbed, GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(this->grabbed);
this->grabbed = nullptr;
}
@@ -1134,7 +1134,7 @@ bool TextTool::root_handler(GdkEvent* event) {
if (this->creating) {
this->creating = false;
if (this->grabbed) {
- sp_canvas_item_ungrab(this->grabbed, GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(this->grabbed);
this->grabbed = nullptr;
}
Inkscape::Rubberband::get(desktop)->stop();
@@ -1256,7 +1256,7 @@ bool TextTool::root_handler(GdkEvent* event) {
if (this->creating) {
this->creating = false;
if (this->grabbed) {
- sp_canvas_item_ungrab(this->grabbed, GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(this->grabbed);
this->grabbed = nullptr;
}
Inkscape::Rubberband::get(desktop)->stop();
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 6b0608fd5..1dc4ad2fb 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -358,7 +358,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
case GDK_2BUTTON_PRESS:
if (panning) {
panning = 0;
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
ret = TRUE;
} else {
/* sp_desktop_dialog(); */
@@ -399,7 +399,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
// Grab background before doing anything else
sp_canvas_rotate_start (SP_CANVAS_ROTATE(desktop->canvas_rotate),
desktop->canvas->_backing_store);
- sp_canvas_item_ungrab (desktop->acetate, event->button.time);
+ sp_canvas_item_ungrab (desktop->acetate);
sp_canvas_item_show (desktop->canvas_rotate);
sp_canvas_item_grab (desktop->canvas_rotate,
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
@@ -471,7 +471,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
|| (panning == 3 && !(event->motion.state & GDK_BUTTON3_MASK))) {
/* Gdk seems to lose button release for us sometimes :-( */
panning = 0;
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
ret = TRUE;
} else {
if (within_tolerance && (abs((gint) event->motion.x - xp)
@@ -544,8 +544,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
if (panning) {
panning = 0;
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
- event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
}
Geom::Point const event_w(event->button.x, event->button.y);
@@ -561,8 +560,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
ret = TRUE;
} else if (panning == event->button.button) {
panning = 0;
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
- event->button.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
// in slow complex drawings, some of the motion events are lost;
// to make up for this, we scroll it once again to the button-up event coordinates
@@ -736,8 +734,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
panning = 0;
xp = yp = 0;
- sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
- event->key.time);
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate));
desktop->updateNow();
}
@@ -1164,15 +1161,8 @@ void sp_event_root_menu_popup(SPDesktop *desktop, SPItem *item, GdkEvent *event)
switch (event->type) {
case GDK_BUTTON_PRESS:
-#if GTKMM_CHECK_VERSION(3,22,0)
case GDK_KEY_PRESS:
CM->popup_at_pointer(event);
-#else
- CM->popup(event->button.button, event->button.time);
- break;
- case GDK_KEY_PRESS:
- CM->popup(0, event->key.time);
-#endif
break;
default:
break;
diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp
index 4f6627d82..0372e8d6c 100644
--- a/src/ui/tools/zoom-tool.cpp
+++ b/src/ui/tools/zoom-tool.cpp
@@ -49,7 +49,7 @@ void ZoomTool::finish() {
this->enableGrDrag(false);
if (this->grabbed) {
- sp_canvas_item_ungrab(this->grabbed, GDK_CURRENT_TIME);
+ sp_canvas_item_ungrab(this->grabbed);
this->grabbed = nullptr;
}
@@ -159,7 +159,7 @@ bool ZoomTool::root_handler(GdkEvent* event) {
Inkscape::Rubberband::get(desktop)->stop();
if (this->grabbed) {
- sp_canvas_item_ungrab(this->grabbed, event->button.time);
+ sp_canvas_item_ungrab(this->grabbed);
this->grabbed = nullptr;
}
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index 27c4b4bea..4862d6d03 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -86,23 +86,20 @@ std::set<cmsUInt32Number> knownColorspaces;
void attachToGridOrTable(GtkWidget *parent, GtkWidget *child, guint left, guint top, guint width, guint height,
bool hexpand = false, bool centered = false, guint xpadding = XPAD, guint ypadding = YPAD)
{
- #if GTK_CHECK_VERSION(3, 12, 0)
gtk_widget_set_margin_start(child, xpadding);
gtk_widget_set_margin_end(child, xpadding);
- #else
- gtk_widget_set_margin_left(child, xpadding);
- gtk_widget_set_margin_right(child, xpadding);
- #endif
-
gtk_widget_set_margin_top(child, ypadding);
gtk_widget_set_margin_bottom(child, ypadding);
+
if (hexpand) {
gtk_widget_set_hexpand(child, TRUE);
}
+
if (centered) {
gtk_widget_set_halign(child, GTK_ALIGN_CENTER);
gtk_widget_set_valign(child, GTK_ALIGN_CENTER);
}
+
gtk_grid_attach(GTK_GRID(parent), child, left, top, width, height);
}
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index 67347d8a4..ca688c660 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -121,13 +121,8 @@ void ColorNotebook::_initUI()
sp_set_font_size_smaller(_buttonbox);
- #if GTK_CHECK_VERSION(3, 12, 0)
gtk_widget_set_margin_start(_buttonbox, XPAD);
gtk_widget_set_margin_end(_buttonbox, XPAD);
- #else
- gtk_widget_set_margin_left(_buttonbox, XPAD);
- gtk_widget_set_margin_right(_buttonbox, XPAD);
- #endif
gtk_widget_set_margin_top(_buttonbox, YPAD);
gtk_widget_set_margin_bottom(_buttonbox, YPAD);
gtk_widget_set_hexpand(_buttonbox, TRUE);
@@ -136,13 +131,8 @@ void ColorNotebook::_initUI()
row++;
-#if GTK_CHECK_VERSION(3, 12, 0)
gtk_widget_set_margin_start(_book, XPAD * 2);
gtk_widget_set_margin_end(_book, XPAD * 2);
-#else
- gtk_widget_set_margin_left(_book, XPAD * 2);
- gtk_widget_set_margin_right(_book, XPAD * 2);
-#endif
gtk_widget_set_margin_top(_book, YPAD);
gtk_widget_set_margin_bottom(_book, YPAD);
gtk_widget_set_hexpand(_book, TRUE);
@@ -208,13 +198,8 @@ void ColorNotebook::_initUI()
gtk_widget_hide(GTK_WIDGET(_box_toomuchink));
#endif // defined(HAVE_LIBLCMS2)
- #if GTK_CHECK_VERSION(3, 12, 0)
gtk_widget_set_margin_start(rgbabox, XPAD);
gtk_widget_set_margin_end(rgbabox, XPAD);
- #else
- gtk_widget_set_margin_left(rgbabox, XPAD);
- gtk_widget_set_margin_right(rgbabox, XPAD);
- #endif
gtk_widget_set_margin_top(rgbabox, YPAD);
gtk_widget_set_margin_bottom(rgbabox, YPAD);
attach(*Glib::wrap(rgbabox), 0, row, 2, 1);
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp
index d68d19aec..03d5767a9 100644
--- a/src/ui/widget/color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -94,13 +94,8 @@ void ColorScales::_initUI(SPColorScalesMode mode)
gtk_widget_set_halign(_l[i], GTK_ALIGN_START);
gtk_widget_show(_l[i]);
- #if GTK_CHECK_VERSION(3, 12, 0)
gtk_widget_set_margin_start(_l[i], XPAD);
gtk_widget_set_margin_end(_l[i], XPAD);
- #else
- gtk_widget_set_margin_left(_l[i], XPAD);
- gtk_widget_set_margin_right(_l[i], XPAD);
- #endif
gtk_widget_set_margin_top(_l[i], YPAD);
gtk_widget_set_margin_bottom(_l[i], YPAD);
gtk_grid_attach(GTK_GRID(t), _l[i], 0, i, 1, 1);
@@ -111,13 +106,8 @@ void ColorScales::_initUI(SPColorScalesMode mode)
_s[i] = Gtk::manage(new Inkscape::UI::Widget::ColorSlider(Glib::wrap(_a[i], true)));
_s[i]->show();
- #if GTK_CHECK_VERSION(3, 12, 0)
_s[i]->set_margin_start(XPAD);
_s[i]->set_margin_end(XPAD);
- #else
- _s[i]->set_margin_left(XPAD);
- _s[i]->set_margin_right(XPAD);
- #endif
_s[i]->set_margin_top(YPAD);
_s[i]->set_margin_bottom(YPAD);
_s[i]->set_hexpand(true);
@@ -129,13 +119,8 @@ void ColorScales::_initUI(SPColorScalesMode mode)
gtk_label_set_mnemonic_widget(GTK_LABEL(_l[i]), _b[i]);
gtk_widget_show(_b[i]);
- #if GTK_CHECK_VERSION(3, 12, 0)
gtk_widget_set_margin_start(_b[i], XPAD);
gtk_widget_set_margin_end(_b[i], XPAD);
- #else
- gtk_widget_set_margin_left(_b[i], XPAD);
- gtk_widget_set_margin_right(_b[i], XPAD);
- #endif
gtk_widget_set_margin_top(_b[i], YPAD);
gtk_widget_set_margin_bottom(_b[i], YPAD);
gtk_widget_set_halign(_b[i], GTK_ALIGN_END);
diff --git a/src/ui/widget/color-slider.cpp b/src/ui/widget/color-slider.cpp
index a6a516774..2d190552a 100644
--- a/src/ui/widget/color-slider.cpp
+++ b/src/ui/widget/color-slider.cpp
@@ -160,7 +160,6 @@ bool ColorSlider::on_button_press_event(GdkEventButton *event)
auto window = _gdk_window->gobj();
-#if GTK_CHECK_VERSION(3,20,0)
auto seat = gdk_event_get_seat(reinterpret_cast<GdkEvent *>(event));
gdk_seat_grab(seat,
window,
@@ -170,16 +169,6 @@ bool ColorSlider::on_button_press_event(GdkEventButton *event)
reinterpret_cast<GdkEvent *>(event),
nullptr,
nullptr);
-#else
- auto device = gdk_event_get_device(reinterpret_cast<GdkEvent *>(event));
- gdk_device_grab(device,
- window,
- GDK_OWNERSHIP_NONE,
- FALSE,
- static_cast<GdkEventMask>(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK),
- NULL,
- event->time);
-#endif
}
return false;
@@ -188,12 +177,7 @@ bool ColorSlider::on_button_press_event(GdkEventButton *event)
bool ColorSlider::on_button_release_event(GdkEventButton *event)
{
if (event->button == 1) {
-#if GTK_CHECK_VERSION(3,20,0)
gdk_seat_ungrab(gdk_event_get_seat(reinterpret_cast<GdkEvent *>(event)));
-#else
- gdk_device_ungrab(gdk_event_get_device(reinterpret_cast<GdkEvent *>(event)),
- gdk_event_get_time(reinterpret_cast<GdkEvent *>(event)));
-#endif
_dragging = false;
signal_released.emit();
if (_value != _oldvalue) {
diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp
index b4f991863..26d30652b 100644
--- a/src/ui/widget/font-variants.cpp
+++ b/src/ui/widget/font-variants.cpp
@@ -221,13 +221,9 @@ namespace Widget {
_ligatures_grid.attach( _ligatures_label_historical, 1, 2, 1, 1);
_ligatures_grid.attach( _ligatures_label_contextual, 1, 3, 1, 1);
-#if GTK_CHECK_VERSION(3,12,0)
_ligatures_grid.set_margin_start(15);
_ligatures_grid.set_margin_end(15);
-#else
- _ligatures_grid.set_margin_left(15);
- _ligatures_grid.set_margin_right(15);
-#endif
+
_ligatures_frame.add( _ligatures_grid );
pack_start( _ligatures_frame, Gtk::PACK_SHRINK );
@@ -255,13 +251,9 @@ namespace Widget {
_position_grid.attach( _position_sub, 1, 0, 1, 1);
_position_grid.attach( _position_super, 2, 0, 1, 1);
-#if GTK_CHECK_VERSION(3,12,0)
_position_grid.set_margin_start(15);
_position_grid.set_margin_end(15);
-#else
- _position_grid.set_margin_left(15);
- _position_grid.set_margin_right(15);
-#endif
+
_position_frame.add( _position_grid );
pack_start( _position_frame, Gtk::PACK_SHRINK );
@@ -305,13 +297,9 @@ namespace Widget {
_caps_grid.attach( _caps_petite, 2, 1, 1, 1);
_caps_grid.attach( _caps_all_petite, 3, 1, 1, 1);
-#if GTK_CHECK_VERSION(3,12,0)
_caps_grid.set_margin_start(15);
_caps_grid.set_margin_end(15);
-#else
- _caps_grid.set_margin_left(15);
- _caps_grid.set_margin_right(15);
-#endif
+
_caps_frame.add( _caps_grid );
pack_start( _caps_frame, Gtk::PACK_SHRINK );
@@ -383,13 +371,9 @@ namespace Widget {
_numeric_grid.attach (_numeric_slashed_zero, 0, 4, 1, 1);
_numeric_grid.attach (_numeric_slashed_zero_label, 1, 4, 1, 1);
-#if GTK_CHECK_VERSION(3,12,0)
_numeric_grid.set_margin_start(15);
_numeric_grid.set_margin_end(15);
-#else
- _numeric_grid.set_margin_left(15);
- _numeric_grid.set_margin_right(15);
-#endif
+
_numeric_frame.add( _numeric_grid );
pack_start( _numeric_frame, Gtk::PACK_SHRINK );
@@ -434,13 +418,9 @@ namespace Widget {
_asian_grid.attach (_asian_proportional_width, 2, 3, 1, 1);
_asian_grid.attach (_asian_ruby, 0, 4, 1, 1);
-#if GTK_CHECK_VERSION(3,12,0)
_asian_grid.set_margin_start(15);
_asian_grid.set_margin_end(15);
-#else
- _asian_grid.set_margin_left(15);
- _asian_grid.set_margin_right(15);
-#endif
+
_asian_frame.add( _asian_grid );
pack_start( _asian_frame, Gtk::PACK_SHRINK );
@@ -476,13 +456,9 @@ namespace Widget {
_feature_vbox.pack_start( _feature_substitutions );
_feature_vbox.pack_start( _feature_list );
-#if GTK_CHECK_VERSION(3,12,0)
_feature_vbox.set_margin_start(15);
_feature_vbox.set_margin_end(15);
-#else
- _feature_vbox.set_margin_left(15);
- _feature_vbox.set_margin_right(15);
-#endif
+
_feature_frame.add( _feature_vbox );
pack_start( _feature_frame, Gtk::PACK_SHRINK );
diff --git a/src/ui/widget/frame.cpp b/src/ui/widget/frame.cpp
index 34ed38eb7..eac4e221b 100644
--- a/src/ui/widget/frame.cpp
+++ b/src/ui/widget/frame.cpp
@@ -53,14 +53,8 @@ Frame::set_padding (guint padding_top, guint padding_bottom, guint padding_left,
{
child->set_margin_top(padding_top);
child->set_margin_bottom(padding_bottom);
-
-#if GTK_CHECK_VERSION(3,12,0)
child->set_margin_start(padding_left);
child->set_margin_end(padding_right);
-#else
- child->set_margin_left(padding_left);
- child->set_margin_right(padding_right);
-#endif
}
}
diff --git a/src/ui/widget/labelled.cpp b/src/ui/widget/labelled.cpp
index 83d2684aa..b320b70af 100644
--- a/src/ui/widget/labelled.cpp
+++ b/src/ui/widget/labelled.cpp
@@ -35,13 +35,8 @@ Labelled::Labelled(Glib::ustring const &label, Glib::ustring const &tooltip,
set_spacing(6);
// Setting margins separately allows for more control over them
-#if GTK_CHECK_VERSION(3,12,0)
set_margin_start(6);
set_margin_end(6);
-#else
- set_margin_left(6);
- set_margin_right(6);
-#endif
pack_start(*Gtk::manage(_label), Gtk::PACK_SHRINK);
pack_start(*Gtk::manage(_widget), Gtk::PACK_SHRINK);
if (mnemonic) {
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index 7e79abb5b..0ba641098 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -99,11 +99,7 @@ void DialogPage::add_line(bool indent,
label_widget->set_markup(label_widget->get_text());
if (indent) {
-#if GTKMM_CHECK_VERSION(3,12,0)
label_widget->set_margin_start(12);
-#else
- label_widget->set_margin_left(12);
-#endif
}
label_widget->set_valign(Gtk::ALIGN_CENTER);
@@ -115,11 +111,7 @@ void DialogPage::add_line(bool indent,
if (label == "")
{
if (indent) {
-#if GTKMM_CHECK_VERSION(3,12,0)
hb->set_margin_start(12);
-#else
- hb->set_margin_left(12);
-#endif
}
add(*hb);
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index b7437c031..ea053765b 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -158,22 +158,12 @@ SelectedStyle::SelectedStyle(bool /*layout*/)
_stroke_width.set_name("monoStrokeWidth");
_fill_empty_space.set_name("fillEmptySpace");
-
-#if GTK_CHECK_VERSION(3,12,0)
_fill_label.set_margin_start(0);
_fill_label.set_margin_end(0);
_stroke_label.set_margin_start(0);
_stroke_label.set_margin_end(0);
_opacity_label.set_margin_start(0);
_opacity_label.set_margin_end(0);
-#else
- _fill_label.set_margin_left(0);
- _fill_label.set_margin_right(0);
- _stroke_label.set_margin_left(0);
- _stroke_label.set_margin_right(0);
- _opacity_label.set_margin_left(0);
- _opacity_label.set_margin_right(0);
-#endif
_table.set_column_spacing(2);
_table.set_row_spacing(0);
@@ -834,11 +824,7 @@ SelectedStyle::on_fill_click(GdkEventButton *event)
fs->showPageFill();
} else if (event->button == 3) { // right-click, popup menu
-#if GTKMM_CHECK_VERSION(3,22,0)
_popup[SS_FILL].popup_at_pointer(reinterpret_cast<GdkEvent *>(event));
-#else
- _popup[SS_FILL].popup(event->button, event->time);
-#endif
} else if (event->button == 2) { // middle click, toggle none/lastcolor
if (_mode[SS_FILL] == SS_NONE) {
on_fill_lastused();
@@ -856,11 +842,7 @@ SelectedStyle::on_stroke_click(GdkEventButton *event)
if (Dialog::FillAndStroke *fs = get_fill_and_stroke_panel(_desktop))
fs->showPageStrokePaint();
} else if (event->button == 3) { // right-click, popup menu
-#if GTKMM_CHECK_VERSION(3,22,0)
_popup[SS_STROKE].popup_at_pointer(reinterpret_cast<GdkEvent *>(event));
-#else
- _popup[SS_STROKE].popup(event->button, event->time);
-#endif
} else if (event->button == 2) { // middle click, toggle none/lastcolor
if (_mode[SS_STROKE] == SS_NONE) {
on_stroke_lastused();
@@ -878,11 +860,7 @@ SelectedStyle::on_sw_click(GdkEventButton *event)
if (Dialog::FillAndStroke *fs = get_fill_and_stroke_panel(_desktop))
fs->showPageStrokeStyle();
} else if (event->button == 3) { // right-click, popup menu
-#if GTKMM_CHECK_VERSION(3,22,0)
_popup_sw.popup_at_pointer(reinterpret_cast<GdkEvent *>(event));
-#else
- _popup_sw.popup(event->button, event->time);
-#endif
} else if (event->button == 2) { // middle click, toggle none/lastwidth?
//
}
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index 97b801547..1d8da2091 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -125,14 +125,8 @@ StyleSwatch::StyleSwatch(SPCSSAttr *css, gchar const *main_tip)
_label[i].set_valign(Gtk::ALIGN_CENTER);
_label[i].set_margin_top(0);
_label[i].set_margin_bottom(0);
-
-#if GTK_CHECK_VERSION(3,12,0)
_label[i].set_margin_start(0);
_label[i].set_margin_end(0);
-#else
- _label[i].set_margin_left(0);
- _label[i].set_margin_right(0);
-#endif
_color_preview[i] = new Inkscape::UI::Widget::ColorPreview (0);
}
@@ -141,14 +135,8 @@ StyleSwatch::StyleSwatch(SPCSSAttr *css, gchar const *main_tip)
_opacity_value.set_valign(Gtk::ALIGN_CENTER);
_opacity_value.set_margin_top(0);
_opacity_value.set_margin_bottom(0);
-
-#if GTK_CHECK_VERSION(3,12,0)
_opacity_value.set_margin_start(0);
_opacity_value.set_margin_end(0);
-#else
- _opacity_value.set_margin_left(0);
- _opacity_value.set_margin_right(0);
-#endif
_table->set_column_spacing(2);
_table->set_row_spacing(0);
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 32ca1bac2..c48d6fbd5 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -226,14 +226,8 @@ SPDesktopWidget::window_get_pointer()
int x, y;
auto window = Glib::wrap(GTK_WIDGET(_canvas))->get_window();
auto display = window->get_display();
-
-#if GTK_CHECK_VERSION(3,20,0)
auto seat = display->get_default_seat();
auto device = seat->get_pointer();
-#else
- auto dm = display->get_device_manager();
- auto device = dm->get_client_pointer();
-#endif
Gdk::ModifierType m;
window->get_device_position(device, x, y, m);
@@ -558,11 +552,8 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
dtw->_select_status = Gtk::manage(new Gtk::Label());
dtw->_select_status->set_name("SelectStatus");
dtw->_select_status->set_ellipsize(Pango::ELLIPSIZE_END);
-#if GTK_CHECK_VERSION(3,10,0)
dtw->_select_status->set_line_wrap(true);
dtw->_select_status->set_lines(2);
-#endif
-
dtw->_select_status->set_halign(Gtk::ALIGN_START);
dtw->_select_status->set_size_request(1, -1);
@@ -990,9 +981,7 @@ SPDesktopWidget::color_profile_event(EgeColorProfTracker */*tracker*/, SPDesktop
GdkScreen* screen = gtk_widget_get_screen(GTK_WIDGET(dtw));
GdkWindow *window = gtk_widget_get_window(gtk_widget_get_toplevel(GTK_WIDGET(dtw)));
- // In old Gtk+ versions, we can directly find the ID number for a monitor.
- // In Gtk+ >= 3.22, however, we need to figure out the ID
-# if GTK_CHECK_VERSION(3,22,0)
+ // Figure out the ID for the monitor
auto display = gdk_display_get_default();
auto monitor = gdk_display_get_monitor_at_window(display, window);
@@ -1005,9 +994,6 @@ SPDesktopWidget::color_profile_event(EgeColorProfTracker */*tracker*/, SPDesktop
auto monitor_at_index = gdk_display_get_monitor(display, i_monitor);
if(monitor_at_index == monitor) monitorNum = i_monitor;
}
-# else // GTK_CHECK_VERSION(3,22,0)
- gint monitorNum = gdk_screen_get_monitor_at_window(screen, window);
-# endif // GTK_CHECK_VERSION(3,22,0)
Glib::ustring id = Inkscape::CMSSystem::getDisplayId( monitorNum );
bool enabled = false;
@@ -2297,12 +2283,8 @@ SPDesktopWidget::on_ruler_box_button_release_event(GdkEventButton *event, Gtk::E
if (_ruler_clicked && event->button == 1) {
sp_event_context_discard_delayed_snap_event(desktop->event_context);
-#if GTK_CHECK_VERSION(3,20,0)
auto seat = gdk_device_get_seat(event->device);
gdk_seat_ungrab(seat);
-#else
- gdk_device_ungrab(event->device, event->time);
-#endif
Geom::Point const event_w(sp_canvas_window_to_world(_canvas, event_win));
Geom::Point event_dt(desktop->w2d(event_w));
@@ -2421,7 +2403,6 @@ SPDesktopWidget::on_ruler_box_button_press_event(GdkEventButton *event, Gtk::Eve
auto window = widget->get_window()->gobj();
-#if GTK_CHECK_VERSION(3,20,0)
auto seat = gdk_device_get_seat(event->device);
gdk_seat_grab(seat,
window,
@@ -2431,15 +2412,6 @@ SPDesktopWidget::on_ruler_box_button_press_event(GdkEventButton *event, Gtk::Eve
(GdkEvent*)event,
nullptr,
nullptr);
-#else
- gdk_device_grab(event->device,
- window,
- GDK_OWNERSHIP_NONE,
- FALSE,
- (GdkEventMask)(GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ),
- NULL,
- event->time);
-#endif
}
return false;
diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp
index 10535ba44..49280bcd3 100644
--- a/src/widgets/ege-adjustment-action.cpp
+++ b/src/widgets/ege-adjustment-action.cpp
@@ -808,12 +808,7 @@ static gboolean event_cb( EgeAdjustmentAction* act, GdkEvent* evt )
if ( IS_EGE_ADJUSTMENT_ACTION(act) ) {
GtkWidget* menu = create_popup_number_menu(act);
gtk_widget_show_all( menu );
-#if GTK_CHECK_VERSION(3,22,0)
gtk_menu_popup_at_pointer( GTK_MENU(menu), evt );
-#else
- GdkEventButton* btnevt = (GdkEventButton*)evt;
- gtk_menu_popup( GTK_MENU(menu), NULL, NULL, NULL, NULL, btnevt->button, btnevt->time );
-#endif
}
handled = TRUE;
}
diff --git a/src/widgets/gimp/ruler.cpp b/src/widgets/gimp/ruler.cpp
index 48ed4a5dd..285952058 100644
--- a/src/widgets/gimp/ruler.cpp
+++ b/src/widgets/gimp/ruler.cpp
@@ -160,9 +160,7 @@ sp_ruler_class_init (SPRulerClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-#if GTK_CHECK_VERSION(3,20,0)
gtk_widget_class_set_css_name (widget_class, "ruler-widget");
-#endif
object_class->dispose = sp_ruler_dispose;
object_class->set_property = sp_ruler_set_property;
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index 91d363154..8498420ae 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -165,13 +165,8 @@ void SPAttributeTable::set_object(SPObject *object,
ll->set_halign(Gtk::ALIGN_START);
ll->set_valign(Gtk::ALIGN_CENTER);
ll->set_vexpand();
-#if GTKMM_CHECK_VERSION(3,12,0)
ll->set_margin_start(XPAD);
ll->set_margin_end(XPAD);
-#else
- ll->set_margin_left(XPAD);
- ll->set_margin_right(XPAD);
-#endif
ll->set_margin_top(XPAD);
ll->set_margin_bottom(XPAD);
table->attach(*ll, 0, i, 1, 1);
@@ -182,13 +177,8 @@ void SPAttributeTable::set_object(SPObject *object,
ee->set_text (val ? val : (const gchar *) "");
ee->set_hexpand();
ee->set_vexpand();
-#if GTKMM_CHECK_VERSION(3,12,0)
ee->set_margin_start(XPAD);
ee->set_margin_end(XPAD);
-#else
- ee->set_margin_left(XPAD);
- ee->set_margin_right(XPAD);
-#endif
ee->set_margin_top(XPAD);
ee->set_margin_bottom(XPAD);
table->attach(*ee, 1, i, 1, 1);
diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp
index aac323cf6..88dc7ff8c 100644
--- a/src/widgets/spw-utilities.cpp
+++ b/src/widgets/spw-utilities.cpp
@@ -40,14 +40,8 @@ Gtk::Label * spw_label(Gtk::Grid *table, const gchar *label_text, int col, int r
label_widget->set_halign(Gtk::ALIGN_START);
label_widget->set_valign(Gtk::ALIGN_CENTER);
-
-#if GTK_CHECK_VERSION(3,12,0)
label_widget->set_margin_start(4);
label_widget->set_margin_end(4);
-#else
- label_widget->set_margin_left(4);
- label_widget->set_margin_right(4);
-#endif
table->attach(*label_widget, col, row, 1, 1);
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index e3b95fa2b..b3f25c764 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -798,15 +798,8 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
swatch->setDesktop( desktop );
swatch->setClickVerb( aux_toolboxes[i].swatch_verb_id );
swatch->setWatchedTool( aux_toolboxes[i].swatch_tool, true );
-
-#if GTKMM_CHECK_VERSION(3,12,0)
swatch->set_margin_start(AUX_BETWEEN_BUTTON_GROUPS);
swatch->set_margin_end(AUX_BETWEEN_BUTTON_GROUPS);
-#else
- swatch->set_margin_left(AUX_BETWEEN_BUTTON_GROUPS);
- swatch->set_margin_right(AUX_BETWEEN_BUTTON_GROUPS);
-#endif
-
swatch->set_margin_top(AUX_SPACING);
swatch->set_margin_bottom(AUX_SPACING);
@@ -878,15 +871,8 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
swatch->setDesktop( desktop );
swatch->setClickVerb( aux_toolboxes[i].swatch_verb_id );
swatch->setWatchedTool( aux_toolboxes[i].swatch_tool, true );
-
-#if GTKMM_CHECK_VERSION(3,12,0)
swatch->set_margin_start(AUX_BETWEEN_BUTTON_GROUPS);
swatch->set_margin_end(AUX_BETWEEN_BUTTON_GROUPS);
-#else
- swatch->set_margin_left(AUX_BETWEEN_BUTTON_GROUPS);
- swatch->set_margin_right(AUX_BETWEEN_BUTTON_GROUPS);
-#endif
-
swatch->set_margin_top(AUX_SPACING);
swatch->set_margin_bottom(AUX_SPACING);