diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-30 10:04:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-30 10:04:02 +0200 |
| commit | e51f73652d38d5c53b331b7bcae2e2483e1b8afe (patch) | |
| tree | 9126d3fd0737db3a0d57cda866d96c377fc0e452 /pkgs/applications/graphics/k3d/k3d_gtkmm224.patch | |
| parent | a283bec71cec60c2b9c84ea9af320fc8df0dfd5f (diff) | |
| parent | 4e0d2706f174bb893378a8241df7bd2055901b9e (diff) | |
| download | nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.gz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.bz2 nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.lz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.xz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.zst nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.zip | |
Merge recent master into staging
Hydra: ?compare=1149952 Conflicts: nixos/doc/manual/configuration.xml (changed split file) nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition) pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
Diffstat (limited to 'pkgs/applications/graphics/k3d/k3d_gtkmm224.patch')
| -rw-r--r-- | pkgs/applications/graphics/k3d/k3d_gtkmm224.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch b/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch new file mode 100644 index 000000000000..2484994531f0 --- /dev/null +++ b/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch @@ -0,0 +1,40 @@ +--- a/k3dsdk/ngui/main_document_window.cpp ++++ b/k3dsdk/ngui/main_document_window.cpp +@@ -1371,7 +1371,7 @@ + Gtk::HBox import_box(false, 5); + Gtk::Label import_label(_("Choose import plugin:")); + +- Gtk::ComboBox import_combo(model); ++ Gtk::ComboBox import_combo((Glib::RefPtr<Gtk::TreeModel> &) model); + import_combo.pack_start(columns.icon, false); + import_combo.pack_start(columns.label); + import_combo.set_active(0); +@@ -1461,7 +1461,7 @@ + Gtk::HBox export_box(false, 5); + Gtk::Label export_label(_("Choose export plugin:")); + +- Gtk::ComboBox export_combo(model); ++ Gtk::ComboBox export_combo((Glib::RefPtr<Gtk::TreeModel> &) model); + export_combo.pack_start(columns.icon, false); + export_combo.pack_start(columns.label); + export_combo.set_active(0); +--- a/k3dsdk/ngui/render.cpp ++++ b/k3dsdk/ngui/render.cpp +@@ -169,7 +169,7 @@ + row[columns.separator] = false; + } + +- Gtk::ComboBox combo(model); ++ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model); + + combo.pack_start(columns.icon, false); + +@@ -295,7 +295,7 @@ + row[columns.separator] = false; + } + +- Gtk::ComboBox combo(model); ++ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model); + + combo.pack_start(columns.icon, false); + |