diff --git a/Source/Glide64/Config.cpp b/Source/Glide64/Config.cpp index 9ad0b4750..204603e19 100644 --- a/Source/Glide64/Config.cpp +++ b/Source/Glide64/Config.cpp @@ -1195,75 +1195,45 @@ void AboutDialog::do_layout() wxBoxSizer* sizer_3 = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sizer_2 = new wxBoxSizer(wxHORIZONTAL); -#include "logo.xpm" -#include "australia.xpm" -#include "brazil.xpm" -#include "france.xpm" -#include "japan.xpm" -#include "russia.xpm" -#include "usa.xpm" - - wxStaticBitmap* bitmap_1 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(logo_xpm, wxBITMAP_TYPE_XPM), wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER); - sizer_1->Add(bitmap_1, 0, wxALL|wxEXPAND, 10); wxStaticText* label_1 = new wxStaticText(this, wxID_ANY, _("authors:")); sizer_1->Add(label_1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5); - wxStaticBitmap* bitmap_2 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(usa_xpm, wxBITMAP_TYPE_XPM), wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER); - sizer_2->Add(bitmap_2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10); wxStaticText* label_2 = new wxStaticText(this, wxID_ANY, _("Dave2001. Original author and former main developer.\nHe founded Glide64 project on Dec. 29th, 2001.\nLeft the project at fall of 2002.\n")); label_2->Enable(false); sizer_2->Add(label_2, 0, 0, 0); sizer_1->Add(sizer_2, 1, wxEXPAND, 0); - wxStaticBitmap* bitmap_3 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(brazil_xpm, wxBITMAP_TYPE_XPM), wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER); - sizer_3->Add(bitmap_3, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 10); wxStaticText* label_3 = new wxStaticText(this, wxID_ANY, _("Gugaman. Developer. Joined the project at winter 2002\n and left it at fall 2002.")); label_3->Enable(false); sizer_3->Add(label_3, 0, 0, 0); sizer_1->Add(sizer_3, 1, wxEXPAND, 0); - wxStaticBitmap* bitmap_4 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(russia_xpm, wxBITMAP_TYPE_XPM), wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER); - sizer_4->Add(bitmap_4, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 10); wxStaticText* label_4 = new wxStaticText(this, wxID_ANY, _("Sergey 'Gonetz' Lipski. Joined the project at winter 2002.\nMain developer since fall of 2002.")); sizer_4->Add(label_4, 0, 0, 0); sizer_1->Add(sizer_4, 1, wxEXPAND, 0); - wxStaticBitmap* bitmap_5 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(japan_xpm, wxBITMAP_TYPE_XPM), wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER); - sizer_13->Add(bitmap_5, 0, wxLEFT|wxRIGHT|wxBOTTOM, 10); wxStaticText* label_15 = new wxStaticText(this, wxID_ANY, _("Hiroshi 'KoolSmoky' Morii, Joined the project in 2007. ")); sizer_13->Add(label_15, 0, 0, 0); sizer_1->Add(sizer_13, 1, wxEXPAND, 0); wxStaticText* label_5 = new wxStaticText(this, wxID_ANY, _("Glitch64 (the wrapper) authors:")); sizer_1->Add(label_5, 0, wxBOTTOM|wxALIGN_CENTER_HORIZONTAL, 10); - wxStaticBitmap* bitmap_6 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(france_xpm, wxBITMAP_TYPE_XPM)); - sizer_6->Add(bitmap_6, 0, wxLEFT|wxRIGHT|wxBOTTOM, 10); wxStaticText* label_6 = new wxStaticText(this, wxID_ANY, wxT("hacktarux")); sizer_6->Add(label_6, 0, 0, 0); sizer_5->Add(sizer_6, 1, wxEXPAND, 0); - wxStaticBitmap* bitmap_7 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(australia_xpm, wxBITMAP_TYPE_XPM)); - sizer_7->Add(bitmap_7, 0, wxRIGHT|wxBOTTOM, 10); wxStaticText* label_7 = new wxStaticText(this, wxID_ANY, wxT("mudlord")); sizer_7->Add(label_7, 0, 0, 0); sizer_5->Add(sizer_7, 1, wxEXPAND, 0); sizer_1->Add(sizer_5, 0, wxEXPAND, 0); - wxStaticBitmap* bitmap_8 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(france_xpm, wxBITMAP_TYPE_XPM)); - sizer_9->Add(bitmap_8, 0, wxLEFT|wxRIGHT|wxBOTTOM, 10); wxStaticText* label_8 = new wxStaticText(this, wxID_ANY, wxT("ziggy")); sizer_9->Add(label_8, 0, 0, 0); sizer_8->Add(sizer_9, 1, wxEXPAND, 0); - wxStaticBitmap* bitmap_9 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(japan_xpm, wxBITMAP_TYPE_XPM)); - sizer_10->Add(bitmap_9, 0, wxRIGHT|wxBOTTOM, 10); wxStaticText* label_9 = new wxStaticText(this, wxID_ANY, wxT("Hiroshi 'KoolSmoky' Morii")); sizer_10->Add(label_9, 0, 0, 0); sizer_8->Add(sizer_10, 1, wxEXPAND, 0); sizer_1->Add(sizer_8, 0, wxEXPAND, 0); wxStaticText* label_10 = new wxStaticText(this, wxID_ANY, _("GlideHQ author:")); sizer_11->Add(label_10, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 10); - wxStaticBitmap* bitmap_10 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(japan_xpm, wxBITMAP_TYPE_XPM)); - sizer_11->Add(bitmap_10, 0, wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10); wxStaticText* label_11 = new wxStaticText(this, wxID_ANY, wxT("Hiroshi 'KoolSmoky' Morii")); sizer_11->Add(label_11, 0, wxALIGN_CENTER_VERTICAL, 0); sizer_1->Add(sizer_11, 1, wxEXPAND, 0); wxStaticText* label_12 = new wxStaticText(this, wxID_ANY, _("beta tester:")); sizer_12->Add(label_12, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 10); - wxStaticBitmap* bitmap_11 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(france_xpm, wxBITMAP_TYPE_XPM)); - sizer_12->Add(bitmap_11, 0, wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10); wxStaticText* label_13 = new wxStaticText(this, wxID_ANY, wxT("olivieryuyu")); sizer_12->Add(label_13, 0, wxALIGN_CENTER_VERTICAL, 0); sizer_1->Add(sizer_12, 1, wxEXPAND, 0);