Extensions: replace deprecated gtkmm symbols

(bzr r10943)

10 files changed, 33 insertions, 35 deletions

diff --git a/src/extension/internal/pdf-input-cairo.cpp b/src/extension/internal/pdf-input-cairo.cpp
index daa185268..d2a958cf7 100644
--- a/src/extension/internal/pdf-input-cairo.cpp
+++ b/src/extension/internal/pdf-input-cairo.cpp
@@ -87,7 +87,7 @@ PdfImportCairoDialog::PdfImportCairoDialog(PopplerDocument *doc)
     _cropTypeCombo = Gtk::manage(new class Gtk::ComboBoxText());
     int num_crop_choices = sizeof(crop_setting_choices) / sizeof(crop_setting_choices[0]);
     for ( int i = 0 ; i < num_crop_choices ; i++ ) {
-        _cropTypeCombo->append_text(_(crop_setting_choices[i]));
+        _cropTypeCombo->append(_(crop_setting_choices[i]));
     }
     _cropTypeCombo->set_active_text(_(crop_setting_choices[0]));
     _cropTypeCombo->set_sensitive(false);
@@ -109,7 +109,7 @@ PdfImportCairoDialog::PdfImportCairoDialog(PopplerDocument *doc)
     // Text options
     _labelText = Gtk::manage(new class Gtk::Label(_("Text handling:")));
     _textHandlingCombo = Gtk::manage(new class Gtk::ComboBoxText());
-    _textHandlingCombo->append_text(_("Import text as text"));
+    _textHandlingCombo->append(_("Import text as text"));
     _textHandlingCombo->set_active_text(_("Import text as text"));
     _localFontsCheck = Gtk::manage(new class Gtk::CheckButton(_("Replace PDF fonts by closest-named installed fonts")));
 
@@ -122,11 +122,11 @@ PdfImportCairoDialog::PdfImportCairoDialog(PopplerDocument *doc)
     vbox1 = Gtk::manage(new class Gtk::VBox(false, 4));
     _previewArea = Gtk::manage(new class Gtk::DrawingArea());
     hbox1 = Gtk::manage(new class Gtk::HBox(false, 4));
-    cancelbutton->set_flags(Gtk::CAN_FOCUS);
-    cancelbutton->set_flags(Gtk::CAN_DEFAULT);
+    cancelbutton->set_can_focus();
+    cancelbutton->set_can_default();
     cancelbutton->set_relief(Gtk::RELIEF_NORMAL);
-    okbutton->set_flags(Gtk::CAN_FOCUS);
-    okbutton->set_flags(Gtk::CAN_DEFAULT);
+    okbutton->set_can_focus();
+    okbutton->set_can_default();
     okbutton->set_relief(Gtk::RELIEF_NORMAL);
     this->get_action_area()->property_layout_style().set_value(Gtk::BUTTONBOX_END);
     _labelSelect->set_alignment(0.5,0.5);
@@ -135,7 +135,7 @@ PdfImportCairoDialog::PdfImportCairoDialog(PopplerDocument *doc)
     _labelSelect->set_line_wrap(false);
     _labelSelect->set_use_markup(false);
     _labelSelect->set_selectable(false);
-    _pageNumberSpin->set_flags(Gtk::CAN_FOCUS);
+    _pageNumberSpin->set_can_focus();
     _pageNumberSpin->set_update_policy(Gtk::UPDATE_ALWAYS);
     _pageNumberSpin->set_numeric(true);
     _pageNumberSpin->set_digits(0);
@@ -149,7 +149,7 @@ PdfImportCairoDialog::PdfImportCairoDialog(PopplerDocument *doc)
     hbox2->pack_start(*_labelSelect, Gtk::PACK_SHRINK, 4);
     hbox2->pack_start(*_pageNumberSpin, Gtk::PACK_SHRINK, 4);
     hbox2->pack_start(*_labelTotalPages, Gtk::PACK_SHRINK, 4);
-    _cropCheck->set_flags(Gtk::CAN_FOCUS);
+    _cropCheck->set_can_focus();
     _cropCheck->set_relief(Gtk::RELIEF_NORMAL);
     _cropCheck->set_mode(true);
     _cropCheck->set_active(false);
@@ -183,8 +183,7 @@ PdfImportCairoDialog::PdfImportCairoDialog(PopplerDocument *doc)
     _labelPrecisionWarning->set_use_markup(true);
     _labelPrecisionWarning->set_selectable(false);
     _fallbackPrecisionSlider->set_size_request(180,-1);
-    _fallbackPrecisionSlider->set_flags(Gtk::CAN_FOCUS);
-    _fallbackPrecisionSlider->set_update_policy(Gtk::UPDATE_CONTINUOUS);
+    _fallbackPrecisionSlider->set_can_focus();
     _fallbackPrecisionSlider->set_inverted(false);
     _fallbackPrecisionSlider->set_digits(1);
     _fallbackPrecisionSlider->set_draw_value(true);
@@ -206,11 +205,11 @@ PdfImportCairoDialog::PdfImportCairoDialog(PopplerDocument *doc)
     _labelText->set_selectable(false);
     hbox5->pack_start(*_labelText, Gtk::PACK_SHRINK, 0);
     hbox5->pack_start(*_textHandlingCombo, Gtk::PACK_SHRINK, 0);
-    _localFontsCheck->set_flags(Gtk::CAN_FOCUS);
+    _localFontsCheck->set_can_focus();
     _localFontsCheck->set_relief(Gtk::RELIEF_NORMAL);
     _localFontsCheck->set_mode(true);
     _localFontsCheck->set_active(true);
-    _embedImagesCheck->set_flags(Gtk::CAN_FOCUS);
+    _embedImagesCheck->set_can_focus();
     _embedImagesCheck->set_relief(Gtk::RELIEF_NORMAL);
     _embedImagesCheck->set_mode(true);
     _embedImagesCheck->set_active(true);
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 0f25616d5..a2ad96c56 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -95,7 +95,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/)
     _cropTypeCombo = Gtk::manage(new class Gtk::ComboBoxText());
     int num_crop_choices = sizeof(crop_setting_choices) / sizeof(crop_setting_choices[0]);
     for ( int i = 0 ; i < num_crop_choices ; i++ ) {
-        _cropTypeCombo->append_text(_(crop_setting_choices[i]));
+        _cropTypeCombo->append(_(crop_setting_choices[i]));
     }
     _cropTypeCombo->set_active_text(_(crop_setting_choices[0]));
     _cropTypeCombo->set_sensitive(false);
@@ -117,7 +117,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/)
     // Text options
     _labelText = Gtk::manage(new class Gtk::Label(_("Text handling:")));
     _textHandlingCombo = Gtk::manage(new class Gtk::ComboBoxText());
-    _textHandlingCombo->append_text(_("Import text as text"));
+    _textHandlingCombo->append(_("Import text as text"));
     _textHandlingCombo->set_active_text(_("Import text as text"));
     _localFontsCheck = Gtk::manage(new class Gtk::CheckButton(_("Replace PDF fonts by closest-named installed fonts")));
 
@@ -130,11 +130,11 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/)
     vbox1 = Gtk::manage(new class Gtk::VBox(false, 4));
     _previewArea = Gtk::manage(new class Gtk::DrawingArea());
     hbox1 = Gtk::manage(new class Gtk::HBox(false, 4));
-    cancelbutton->set_flags(Gtk::CAN_FOCUS);
-    cancelbutton->set_flags(Gtk::CAN_DEFAULT);
+    cancelbutton->set_can_focus();
+    cancelbutton->set_can_default();
     cancelbutton->set_relief(Gtk::RELIEF_NORMAL);
-    okbutton->set_flags(Gtk::CAN_FOCUS);
-    okbutton->set_flags(Gtk::CAN_DEFAULT);
+    okbutton->set_can_focus();
+    okbutton->set_can_default();
     okbutton->set_relief(Gtk::RELIEF_NORMAL);
     this->get_action_area()->property_layout_style().set_value(Gtk::BUTTONBOX_END);
     _labelSelect->set_alignment(0.5,0.5);
@@ -143,7 +143,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/)
     _labelSelect->set_line_wrap(false);
     _labelSelect->set_use_markup(false);
     _labelSelect->set_selectable(false);
-    _pageNumberSpin->set_flags(Gtk::CAN_FOCUS);
+    _pageNumberSpin->set_can_focus();
     _pageNumberSpin->set_update_policy(Gtk::UPDATE_ALWAYS);
     _pageNumberSpin->set_numeric(true);
     _pageNumberSpin->set_digits(0);
@@ -157,7 +157,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/)
     hbox2->pack_start(*_labelSelect, Gtk::PACK_SHRINK, 4);
     hbox2->pack_start(*_pageNumberSpin, Gtk::PACK_SHRINK, 4);
     hbox2->pack_start(*_labelTotalPages, Gtk::PACK_SHRINK, 4);
-    _cropCheck->set_flags(Gtk::CAN_FOCUS);
+    _cropCheck->set_can_focus();
     _cropCheck->set_relief(Gtk::RELIEF_NORMAL);
     _cropCheck->set_mode(true);
     _cropCheck->set_active(false);
@@ -191,8 +191,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/)
     _labelPrecisionWarning->set_use_markup(true);
     _labelPrecisionWarning->set_selectable(false);
     _fallbackPrecisionSlider->set_size_request(180,-1);
-    _fallbackPrecisionSlider->set_flags(Gtk::CAN_FOCUS);
-    _fallbackPrecisionSlider->set_update_policy(Gtk::UPDATE_CONTINUOUS);
+    _fallbackPrecisionSlider->set_can_focus();
     _fallbackPrecisionSlider->set_inverted(false);
     _fallbackPrecisionSlider->set_digits(1);
     _fallbackPrecisionSlider->set_draw_value(true);
@@ -214,11 +213,11 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/)
     _labelText->set_selectable(false);
     hbox5->pack_start(*_labelText, Gtk::PACK_SHRINK, 0);
     hbox5->pack_start(*_textHandlingCombo, Gtk::PACK_SHRINK, 0);
-    _localFontsCheck->set_flags(Gtk::CAN_FOCUS);
+    _localFontsCheck->set_can_focus();
     _localFontsCheck->set_relief(Gtk::RELIEF_NORMAL);
     _localFontsCheck->set_mode(true);
     _localFontsCheck->set_active(true);
-    _embedImagesCheck->set_flags(Gtk::CAN_FOCUS);
+    _embedImagesCheck->set_can_focus();
     _embedImagesCheck->set_relief(Gtk::RELIEF_NORMAL);
     _embedImagesCheck->set_mode(true);
     _embedImagesCheck->set_active(true);
diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp
index 9f7c6e69a..dade2c275 100644
--- a/src/extension/param/bool.cpp
+++ b/src/extension/param/bool.cpp
@@ -130,7 +130,7 @@ Gtk::Widget *ParamBool::get_widget(SPDocument * doc, Inkscape::XML::Node * node,
 
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
 
-    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_LEFT));
+    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START));
     label->show();
     hbox->pack_end(*label, true, true);
 
diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp
index 5eeb24ac7..f6bbb5447 100644
--- a/src/extension/param/description.cpp
+++ b/src/extension/param/description.cpp
@@ -81,12 +81,12 @@ ParamDescription::get_widget (SPDocument * /*doc*/, Inkscape::XML::Node * /*node
     Gtk::Label * label;
     int padding = 12 + _indent;
     if (_mode == HEADER) {
-        label = Gtk::manage(new Gtk::Label(Glib::ustring("<b>") +newguitext + Glib::ustring("</b>"), Gtk::ALIGN_LEFT));
+        label = Gtk::manage(new Gtk::Label(Glib::ustring("<b>") +newguitext + Glib::ustring("</b>"), Gtk::ALIGN_START));
         label->set_padding(0,5);
         label->set_use_markup(true);
         padding = _indent;
     } else {
-        label = Gtk::manage(new Gtk::Label(newguitext, Gtk::ALIGN_LEFT));
+        label = Gtk::manage(new Gtk::Label(newguitext, Gtk::ALIGN_START));
     }
     label->set_line_wrap();
     label->show();
diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp
index 7cda98117..3e4462b8a 100644
--- a/src/extension/param/enum.cpp
+++ b/src/extension/param/enum.cpp
@@ -232,7 +232,7 @@ Gtk::Widget *ParamComboBox::get_widget(SPDocument * doc, Inkscape::XML::Node * n
 
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
 
-    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_LEFT));
+    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START));
     label->show();
     hbox->pack_start(*label, false, false, _indent);
 
@@ -242,7 +242,7 @@ Gtk::Widget *ParamComboBox::get_widget(SPDocument * doc, Inkscape::XML::Node * n
     for (GSList * list = choices; list != NULL; list = g_slist_next(list)) {
         enumentry * entr = reinterpret_cast<enumentry *>(list->data);
         Glib::ustring text = entr->guitext;
-        combo->append_text(text);
+        combo->append(text);
         if ( _value && !entr->value.compare(_value) ) {
             settext = entr->guitext;
         }
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index 29b13eef3..b9a723eea 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -175,7 +175,7 @@ Gtk::Widget * ParamFloat::get_widget(SPDocument * doc, Inkscape::XML::Node * nod
 
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
 
-    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_LEFT));
+    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START));
     label->show();
     hbox->pack_start(*label, true, true, _indent);
 
diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp
index c7fa3b412..1ef31f348 100644
--- a/src/extension/param/int.cpp
+++ b/src/extension/param/int.cpp
@@ -156,7 +156,7 @@ ParamInt::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal
 
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
 
-    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_LEFT));
+    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START));
     label->show();
     hbox->pack_start(*label, true, true, _indent);
 
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index 63dc77f21..6bb3cda80 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -366,7 +366,7 @@ public:
 void ParamNotebookWdg::changed_page(GtkNotebookPage */*page*/,
                                     guint pagenum)
 {
-    if (is_visible()) {
+    if (get_visible()) {
         _pref->set((int)pagenum, _doc, _node);
     }
 }
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index 1c43b5729..7df89de90 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -275,7 +275,7 @@ Gtk::Widget * ParamRadioButton::get_widget(SPDocument * doc, Inkscape::XML::Node
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
     Gtk::VBox * vbox = Gtk::manage(new Gtk::VBox(false, 0));
 
-    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_LEFT, Gtk::ALIGN_TOP));
+    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START, Gtk::ALIGN_START));
     label->show();
     hbox->pack_start(*label, false, false, _indent);
 
@@ -296,7 +296,7 @@ Gtk::Widget * ParamRadioButton::get_widget(SPDocument * doc, Inkscape::XML::Node
         switch ( _mode ) {
             case MINIMAL:
             {
-                cbt->append_text(*text);
+                cbt->append(*text);
                 if (!entr->value->compare(_value)) {
                     cbt->set_active_text(*text);
                     comboSet = true;
diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 6b205d627..23f53cdbe 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -155,7 +155,7 @@ Gtk::Widget * ParamString::get_widget(SPDocument * doc, Inkscape::XML::Node * no
 
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
 
-    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_LEFT));
+    Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START));
     label->show();
     hbox->pack_start(*label, false, false, _indent);