From 630be8274013c5eef5f19e19a14bc6d759aada5a Mon Sep 17 00:00:00 2001 From: Alexander Valavanis Date: Sun, 26 May 2019 16:11:07 +0100 Subject: Rm unused code now Gtk+ >= 3.22 dependency is set --- src/extension/extension.cpp | 4 ---- src/extension/internal/pdfinput/pdf-input.cpp | 27 --------------------------- src/extension/param/notebook.cpp | 4 ---- 3 files changed, 35 deletions(-) (limited to 'src/extension') 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(); -- cgit v1.2.3