diff options
| author | Lukas Matena <lukasmatena@seznam.cz> | 2019-10-29 12:40:34 +0300 |
|---|---|---|
| committer | Lukas Matena <lukasmatena@seznam.cz> | 2019-10-29 12:40:34 +0300 |
| commit | 8b5561aec7e6e2411396b3bf6b67cb333319687f (patch) | |
| tree | e036ee74b4604ff827fe8a044c0a03b1ca6cbf0e /src/slic3r/GUI/GUI_App.hpp | |
| parent | 9e8ce66f70ce29a4badd54a6e3d8688ed36f903f (diff) | |
Fixed several warnings
Diffstat (limited to 'src/slic3r/GUI/GUI_App.hpp')
| -rw-r--r-- | src/slic3r/GUI/GUI_App.hpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index c5ddc0152..9bfc34543 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -87,7 +87,7 @@ class GUI_App : public wxApp wxFont m_bold_font; wxFont m_normal_font; - size_t m_em_unit; // width of a "m"-symbol in pixels for current system font + int m_em_unit; // width of a "m"-symbol in pixels for current system font // Note: for 100% Scale m_em_unit = 10 -> it's a good enough coefficient for a size setting of controls std::unique_ptr<wxLocale> m_wxLocale; @@ -105,7 +105,7 @@ public: bool initialized() const { return m_initialized; } GUI_App(); - ~GUI_App(); + ~GUI_App() override; static unsigned get_colour_approx_luma(const wxColour &colour); static bool dark_mode(); @@ -124,8 +124,7 @@ public: const wxFont& small_font() { return m_small_font; } const wxFont& bold_font() { return m_bold_font; } const wxFont& normal_font() { return m_normal_font; } - size_t em_unit() const { return m_em_unit; } - void set_em_unit(const size_t em_unit) { m_em_unit = em_unit; } + int em_unit() const { return m_em_unit; } float toolbar_icon_scale(const bool is_limited = false) const; void recreate_GUI(); @@ -155,7 +154,7 @@ public: // Translate the language code to a code, for which Prusa Research maintains translations. Defaults to "en_US". wxString current_language_code_safe() const; - virtual bool OnExceptionInMainLoop(); + virtual bool OnExceptionInMainLoop() override; #ifdef __APPLE__ // wxWidgets override to get an event on open files. |