From ed5ac758f94a4549173c3d316bb9682f5900b784 Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Wed, 31 Jan 2007 20:38:31 +0000
Subject: [PATCH] Fixed filename bug (linux); disabled hover buttons on welcome
 window (linux)

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@193 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 src/gui/welcome_window.cpp      | 14 ++++++++++----
 src/util/io/package_manager.cpp |  4 +++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/gui/welcome_window.cpp b/src/gui/welcome_window.cpp
index 72646b9e..83170b43 100644
--- a/src/gui/welcome_window.cpp
+++ b/src/gui/welcome_window.cpp
@@ -26,8 +26,14 @@ WelcomeWindow::WelcomeWindow()
 	SetIcon(load_resource_icon(_("app")));
 	
 	// init controls
-	wxButton* new_set   = new HoverButtonExt(this, ID_FILE_NEW,    load_resource_image(_("welcome_new")),  _BUTTON_("new set"),  _HELP_("new set"));
-	wxButton* open_set  = new HoverButtonExt(this, ID_FILE_OPEN,   load_resource_image(_("welcome_open")), _BUTTON_("open set"), _HELP_("open set"));
+	#ifdef __WXMSW__
+		wxButton* new_set   = new HoverButtonExt(this, ID_FILE_NEW,    load_resource_image(_("welcome_new")),  _BUTTON_("new set"),  _HELP_("new set"));	
+		wxButton* open_set  = new HoverButtonExt(this, ID_FILE_OPEN,   load_resource_image(_("welcome_open")), _BUTTON_("open set"), _HELP_("open set"));
+	#else
+		// For now, hover buttons don't work on GTK
+		wxButton* new_set   = new wxButton(this, ID_FILE_NEW,  _BUTTON_("new set"));
+		wxButton* open_set  = new wxButton(this, ID_FILE_OPEN, _BUTTON_("open set"));
+	#endif
 	wxButton* open_last = 0;
 	if (!settings.recent_sets.empty()) {
 		wxFileName n(settings.recent_sets.front());
@@ -74,7 +80,7 @@ void WelcomeWindow::onNewSet(wxCommandEvent&) {
 	close(new_set_window(this));
 }
 
-// MOVEME
+// TODO: MOVEME
 template <typename T>
 shared_ptr<T> open_package(const String& filename) {
 	shared_ptr<T> package(new T);
@@ -115,7 +121,7 @@ HoverButtonExt::HoverButtonExt(Window* parent, int id, const wxImage& icon, cons
 
 void HoverButtonExt::draw(DC& dc) {
 	// draw button
-	HoverButton::draw(dc);
+//	HoverButton::draw(dc);
 	// icon
 	if (icon.Ok()) dc.DrawBitmap(icon, 7, 7);
 	// text
diff --git a/src/util/io/package_manager.cpp b/src/util/io/package_manager.cpp
index 3dda65f8..75f5a55d 100644
--- a/src/util/io/package_manager.cpp
+++ b/src/util/io/package_manager.cpp
@@ -58,7 +58,9 @@ void PackageManager::init() {
 }
 
 PackagedP PackageManager::openAny(const String& name) {
-	wxFileName fn(data_directory + _("/") + name);
+	wxFileName fn(
+		(wxFileName(name).IsRelative() ? data_directory + _("/") : wxString(wxEmptyString))
+		+ name);
 	fn.Normalize();
 	String filename = fn.GetFullPath();
 	// Is this package already loaded?