diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-03-07 23:40:41 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-03-07 23:40:41 +0000 |
| commit | ffca253daf7e55a0508c15393d672e01c65e2df0 (patch) | |
| tree | 433af1c703dab415442346ff4161586f87ad7315 /src/extension | |
| parent | Permanent show outline in BSpline mode (diff) | |
| parent | Fix deprecated Gtkmm symbols in preferences widget (diff) | |
| download | inkscape-ffca253daf7e55a0508c15393d672e01c65e2df0.tar.gz inkscape-ffca253daf7e55a0508c15393d672e01c65e2df0.zip | |
update to trunk
(bzr r11950.1.48)
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/internal/pdf-input-cairo.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/pdf-input-cairo.h | 11 | ||||
| -rw-r--r-- | src/extension/internal/pdfinput/pdf-input.cpp | 2 | ||||
| -rw-r--r-- | src/extension/internal/pdfinput/pdf-input.h | 7 |
4 files changed, 18 insertions, 4 deletions
diff --git a/src/extension/internal/pdf-input-cairo.cpp b/src/extension/internal/pdf-input-cairo.cpp index 0a9dd8399..d3c6c5931 100644 --- a/src/extension/internal/pdf-input-cairo.cpp +++ b/src/extension/internal/pdf-input-cairo.cpp @@ -108,7 +108,7 @@ PdfImportCairoDialog::PdfImportCairoDialog(PopplerDocument *doc) #if WITH_GTKMM_3_0 _fallbackPrecisionSlider_adj = Gtk::Adjustment::create(2, 1, 256, 1, 10, 10); - _fallbackPrecisionSlider = Gtk::manage(new Gtk::HScale(_fallbackPrecisionSlider_adj)); + _fallbackPrecisionSlider = Gtk::manage(new Gtk::Scale(_fallbackPrecisionSlider_adj)); #else _fallbackPrecisionSlider_adj = Gtk::manage(new class Gtk::Adjustment(2, 1, 256, 1, 10, 10)); _fallbackPrecisionSlider = Gtk::manage(new class Gtk::HScale(*_fallbackPrecisionSlider_adj)); diff --git a/src/extension/internal/pdf-input-cairo.h b/src/extension/internal/pdf-input-cairo.h index 81e9a8f00..66f1e5e7e 100644 --- a/src/extension/internal/pdf-input-cairo.h +++ b/src/extension/internal/pdf-input-cairo.h @@ -37,6 +37,14 @@ #include "../implementation/implementation.h" +namespace Gtk { +#if WITH_GTKMM_3_0 + class Scale; +#else + class HScale; +#endif +} + namespace Inkscape { namespace UI { @@ -85,10 +93,11 @@ private: class Inkscape::UI::Widget::Frame * _pageSettingsFrame; class Gtk::Label * _labelPrecision; class Gtk::Label * _labelPrecisionWarning; - class Gtk::HScale * _fallbackPrecisionSlider; #if WITH_GTKMM_3_0 + class Gtk::Scale * _fallbackPrecisionSlider; Glib::RefPtr<Gtk::Adjustment> _fallbackPrecisionSlider_adj; #else + class Gtk::HScale * _fallbackPrecisionSlider; class Gtk::Adjustment *_fallbackPrecisionSlider_adj; #endif class Gtk::Label * _labelPrecisionComment; diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index 90d53c6b0..535deafce 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -124,7 +124,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/) #if WITH_GTKMM_3_0 _fallbackPrecisionSlider_adj = Gtk::Adjustment::create(2, 1, 256, 1, 10, 10); - _fallbackPrecisionSlider = Gtk::manage(new class Gtk::HScale(_fallbackPrecisionSlider_adj)); + _fallbackPrecisionSlider = Gtk::manage(new class Gtk::Scale(_fallbackPrecisionSlider_adj)); #else _fallbackPrecisionSlider_adj = Gtk::manage(new class Gtk::Adjustment(2, 1, 256, 1, 10, 10)); _fallbackPrecisionSlider = Gtk::manage(new class Gtk::HScale(*_fallbackPrecisionSlider_adj)); diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h index e9da5b27c..3710e4667 100644 --- a/src/extension/internal/pdfinput/pdf-input.h +++ b/src/extension/internal/pdfinput/pdf-input.h @@ -39,7 +39,11 @@ namespace Gtk { class DrawingArea; class Frame; class HBox; +#if WITH_GTKMM_3_0 + class Scale; +#else class HScale; +#endif class VBox; class Label; } @@ -95,10 +99,11 @@ private: class Inkscape::UI::Widget::Frame * _pageSettingsFrame; class Gtk::Label * _labelPrecision; class Gtk::Label * _labelPrecisionWarning; - class Gtk::HScale * _fallbackPrecisionSlider; #if WITH_GTKMM_3_0 + class Gtk::Scale * _fallbackPrecisionSlider; Glib::RefPtr<Gtk::Adjustment> _fallbackPrecisionSlider_adj; #else + class Gtk::HScale * _fallbackPrecisionSlider; class Gtk::Adjustment *_fallbackPrecisionSlider_adj; #endif class Gtk::Label * _labelPrecisionComment; |