amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-11 05:07:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

made welcome_window compile on windows again

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1241 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-12-11 15:16:27 +00:00
parent 44a779222d
commit fee35c2804
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/welcome_window.cpp
+7 -3
View File
@@ -47,12 +47,15 @@ WelcomeWindow::WelcomeWindow()
#endif #endif
wxControl* open_last = nullptr; wxControl* open_last = nullptr;
if (!settings.recent_sets.empty()) { if (!settings.recent_sets.empty()) {
if (wxFileName::FileExists(settings.recent_sets.front()) || wxFileName::DirExists(settings.recent_sets.front()+_("/"))) const String& filename = settings.recent_sets.front();
if (wxFileName::FileExists(filename) || wxFileName::DirExists(filename + _("/"))) {
#ifdef USE_HOVERBUTTON #ifdef USE_HOVERBUTTON
wxFileName n(filename);
open_last = new HoverButtonExt(this, ID_FILE_RECENT, load_resource_image(_("welcome_last")), _BUTTON_("last opened set"), _HELP_1_("last opened set", n.GetName())); open_last = new HoverButtonExt(this, ID_FILE_RECENT, load_resource_image(_("welcome_last")), _BUTTON_("last opened set"), _HELP_1_("last opened set", n.GetName()));
#else #else
open_last = new wxButton(this, ID_FILE_RECENT, _BUTTON_("last opened set")); open_last = new wxButton(this, ID_FILE_RECENT, _BUTTON_("last opened set"));
#endif #endif
}
} }
wxSizer* s1 = new wxBoxSizer(wxHORIZONTAL); wxSizer* s1 = new wxBoxSizer(wxHORIZONTAL);
@@ -104,8 +107,9 @@ void WelcomeWindow::onOpenLast(wxCommandEvent&) {
try { try {
close( open_package<Set>(settings.recent_sets.front()) ); close( open_package<Set>(settings.recent_sets.front()) );
} catch (PackageNotFoundError& e) { } catch (PackageNotFoundError& e) {
handle_error(_("Cannot find package ") + e.what() + _(" to open.")); handle_error(_("Cannot find set ") + e.what() + _(" to open."));
settings.recent_sets.clear(); // remove this package from the recent sets, so we don't get this error again
settings.recent_sets.erase(settings.recent_sets.begin());
} }
} }