diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-07 11:11:57 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-07 11:11:57 +0000 |
| commit | f97d10f1b5fd32fe58e77d496d60fb82fa1adbf1 (patch) | |
| tree | 7b0936d5e888b3b196105a86a8d2611dcac04a59 /src/extension/internal/pdf-input-cairo.cpp | |
| parent | (cppcheck and janitorial tasks:) C-style casting to C++-style casting (diff) | |
| download | inkscape-f97d10f1b5fd32fe58e77d496d60fb82fa1adbf1.tar.gz inkscape-f97d10f1b5fd32fe58e77d496d60fb82fa1adbf1.zip | |
Cleaning up my mess... backward compatibility and fix Windows build (hopefully)
Fixed bugs:
- https://launchpad.net/bugs/927992
(bzr r10947)
Diffstat (limited to 'src/extension/internal/pdf-input-cairo.cpp')
| -rw-r--r-- | src/extension/internal/pdf-input-cairo.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/extension/internal/pdf-input-cairo.cpp b/src/extension/internal/pdf-input-cairo.cpp index d2a958cf7..bc76a30b5 100644 --- a/src/extension/internal/pdf-input-cairo.cpp +++ b/src/extension/internal/pdf-input-cairo.cpp @@ -87,7 +87,11 @@ 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++ ) { +#if WITH_GTKMM_2_24 _cropTypeCombo->append(_(crop_setting_choices[i])); +#else + _cropTypeCombo->append_text(_(crop_setting_choices[i])); +#endif } _cropTypeCombo->set_active_text(_(crop_setting_choices[0])); _cropTypeCombo->set_sensitive(false); @@ -109,7 +113,11 @@ PdfImportCairoDialog::PdfImportCairoDialog(PopplerDocument *doc) // Text options _labelText = Gtk::manage(new class Gtk::Label(_("Text handling:"))); _textHandlingCombo = Gtk::manage(new class Gtk::ComboBoxText()); +#if WITH_GTKMM_2_24 _textHandlingCombo->append(_("Import text as text")); +#else + _textHandlingCombo->append_text(_("Import text as text")); +#endif _textHandlingCombo->set_active_text(_("Import text as text")); _localFontsCheck = Gtk::manage(new class Gtk::CheckButton(_("Replace PDF fonts by closest-named installed fonts"))); |