From 290e3e66c01dbb181ab05a6fa551ec3b66dd7220 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Wed, 4 Apr 2018 14:41:23 +0200 Subject: [PATCH] Merge correction --- xs/src/slic3r/GUI/GUI.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xs/src/slic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp index 3fc3bfba2..80a6427d5 100644 --- a/xs/src/slic3r/GUI/GUI.cpp +++ b/xs/src/slic3r/GUI/GUI.cpp @@ -716,8 +716,10 @@ ConfigOptionsGroup* get_optgroup() } -wxButton* get_wiping_dialog_button(){ +wxButton* get_wiping_dialog_button() +{ return g_wiping_dialog_button; +} wxWindow* export_option_creator(wxWindow* parent) { @@ -762,6 +764,9 @@ int get_export_option(wxFileDialog* dlg) } return 0; + } -} } + +} // namespace GUI +} // namespace Slic3r