diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
| commit | 5a4fb2325f60d292b47330f540b26a3279341c90 (patch) | |
| tree | d2aa7967be25450b83e625025366c618101ae49f /src/extension/error-file.cpp | |
| parent | The Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff) | |
| parent | Remove Snap menu item and improve grid menu item text (diff) | |
| download | inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip | |
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/extension/error-file.cpp')
| -rw-r--r-- | src/extension/error-file.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp index 2a56f55e8..f60af870f 100644 --- a/src/extension/error-file.cpp +++ b/src/extension/error-file.cpp @@ -12,12 +12,11 @@ #include "config.h" #endif -#include <glibmm/i18n.h> - +#include "ui/dialog/extensions.h" +#include <glibmm/i18n.h> #include "inkscape.h" #include "preferences.h" -#include "ui/dialog/extensions.h" #include "extension/extension.h" #include "error-file.h" @@ -40,7 +39,7 @@ namespace Extension { probably good to check anyway). */ ErrorFileNotice::ErrorFileNotice (void) : - Gtk::MessageDialog::MessageDialog( + Gtk::MessageDialog( "", /* message */ false, /* use markup */ Gtk::MESSAGE_WARNING, /* dialog type */ @@ -56,7 +55,11 @@ ErrorFileNotice::ErrorFileNotice (void) : g_free(ext_error_file); set_message(dialog_text, true); +#if WITH_GTKMM_3_0 + Gtk::Box * vbox = get_content_area(); +#else Gtk::Box * vbox = get_vbox(); +#endif /* This is some filler text, needs to change before relase */ Inkscape::Preferences *prefs = Inkscape::Preferences::get(); |