diff --git a/resource/about.png b/resource/about.png index c699e29c..5c0ae3d7 100644 Binary files a/resource/about.png and b/resource/about.png differ diff --git a/resource/two_beta.png b/resource/two_beta.png deleted file mode 100644 index 39e3977e..00000000 Binary files a/resource/two_beta.png and /dev/null differ diff --git a/resource/win32_res.rc b/resource/win32_res.rc index 4bdffc33..4050ec75 100644 --- a/resource/win32_res.rc +++ b/resource/win32_res.rc @@ -146,7 +146,6 @@ bool_yes IMAGE "bool_yes.png" bool_no IMAGE "bool_no.png" about IMAGE "about.png" -two_beta IMAGE "two_beta.png" btn_normal IMAGE "btn_normal.png" btn_hover IMAGE "btn_hover.png" btn_focus IMAGE "btn_focus.png" diff --git a/src/gui/about_window.cpp b/src/gui/about_window.cpp index f8a50de6..d49ae845 100644 --- a/src/gui/about_window.cpp +++ b/src/gui/about_window.cpp @@ -17,9 +17,6 @@ AboutWindow::AboutWindow(Window* parent) : wxDialog(parent, wxID_ANY, _TITLE_("about"), wxDefaultPosition, wxSize(510,340), wxCLIP_CHILDREN | wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL) , logo (load_resource_image(_("about"))) - #if USE_BETA_LOGO - , logo2(load_resource_image(_("two_beta"))) - #endif { // init controls wxControl* ok_button = new HoverButton(this, wxID_OK, _("btn_ok")); diff --git a/src/gui/welcome_window.cpp b/src/gui/welcome_window.cpp index c2cc1234..c58f7fc5 100644 --- a/src/gui/welcome_window.cpp +++ b/src/gui/welcome_window.cpp @@ -27,9 +27,6 @@ WelcomeWindow::WelcomeWindow() : wxFrame(nullptr, wxID_ANY, _TITLE_("magic set editor"), wxDefaultPosition, wxSize(520,380), wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL | wxCLIP_CHILDREN ) , logo (load_resource_image(_("about"))) - #if USE_BETA_LOGO - , logo2(load_resource_image(_("two_beta"))) - #endif { SetIcon(load_resource_icon(_("app")));