diff options
author | bubnikv <bubnikv@gmail.com> | 2020-03-04 14:48:04 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2020-03-04 14:48:04 +0300 |
commit | ab7109568a42b9172d5a947e71e362d755329389 (patch) | |
tree | 14d8d2d44543e06174f4281572f19347ca8cc33c /src/slic3r/GUI/Field.hpp | |
parent | cbe9216d79b9042fc70cbb5b8282a78e4c43cb00 (diff) |
WIP: Fixed some compilation issues on OSX, fixed some "override" vs. "virtual"
warnings.
Diffstat (limited to 'src/slic3r/GUI/Field.hpp')
-rw-r--r-- | src/slic3r/GUI/Field.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/slic3r/GUI/Field.hpp b/src/slic3r/GUI/Field.hpp index ca0c77d5c..1f8b642b1 100644 --- a/src/slic3r/GUI/Field.hpp +++ b/src/slic3r/GUI/Field.hpp @@ -284,7 +284,7 @@ public: TextCtrl(wxWindow* parent, const ConfigOptionDef& opt, const t_config_option_key& id) : Field(parent, opt, id) {} ~TextCtrl() {} - void BUILD(); + void BUILD() override; bool value_was_changed(); // Propagate value from field to the OptionGroupe and Config after kill_focus/ENTER void propagate_value(); @@ -303,9 +303,9 @@ public: void msw_rescale(bool rescale_sidetext = false) override; - virtual void enable(); - virtual void disable(); - virtual wxWindow* getWindow() { return window; } + void enable() override; + void disable() override; + wxWindow* getWindow() override { return window; } }; class CheckBox : public Field { |