Merge remote-tracking branch 'origin/master' into ys_hdpi

This commit is contained in:
YuSanka 2019-02-06 11:12:44 +01:00
commit b2410e0f23
51 changed files with 7406 additions and 275 deletions

View file

@ -71,6 +71,7 @@ static wxString dots("…", wxConvUTF8);
class GUI_App : public wxApp
{
bool m_initialized { false };
bool app_conf_exists{ false };
wxColour m_color_label_modified;
@ -93,6 +94,7 @@ class GUI_App : public wxApp
public:
bool OnInit() override;
bool initialized() const { return m_initialized; }
GUI_App();