From 4079bc26b8cdfa93cf51c05c7fba2084ab1282ab Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Fri, 21 Jan 2011 13:15:09 +0000
Subject: [PATCH] no longer use the "beta" logo, in preparation of 2.0.0
 release

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1628 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 src/gui/about_window.cpp   | 6 +++++-
 src/gui/about_window.hpp   | 9 ++++++---
 src/gui/welcome_window.hpp | 5 ++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/gui/about_window.cpp b/src/gui/about_window.cpp
index 1ceac5d9..101e3e0b 100644
--- a/src/gui/about_window.cpp
+++ b/src/gui/about_window.cpp
@@ -17,7 +17,9 @@
 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"));
@@ -38,7 +40,9 @@ void AboutWindow::draw(DC& dc) {
 	dc.DrawRectangle(0, 0, ws.GetWidth(), ws.GetHeight());
 	// draw logo
 	dc.DrawBitmap(logo,  (ws.GetWidth() -  logo.GetWidth()) / 2, 5);
-	dc.DrawBitmap(logo2,  ws.GetWidth() - logo2.GetWidth(),      ws.GetHeight() - logo2.GetHeight());
+	#if USE_BETA_LOGO
+		dc.DrawBitmap(logo2,  ws.GetWidth() - logo2.GetWidth(),      ws.GetHeight() - logo2.GetHeight());
+	#endif
 	// draw version box
 	dc.SetPen  (wxPen(Color(184,29,19), 2));
 	dc.SetBrush(Color(114,197,224));
diff --git a/src/gui/about_window.hpp b/src/gui/about_window.hpp
index 949361a0..71d04255 100644
--- a/src/gui/about_window.hpp
+++ b/src/gui/about_window.hpp
@@ -20,9 +20,12 @@ class AboutWindow : public wxDialog {
 	
   private:
 	DECLARE_EVENT_TABLE();
-
-	// graphics
-	Bitmap logo, logo2;
+	
+	// MSE logos
+	Bitmap logo;
+	#if USE_BETA_LOGO
+		Bitmap logo2;
+	#endif
 	
 	void onPaint(wxPaintEvent&);
 	void draw(DC& dc);
diff --git a/src/gui/welcome_window.hpp b/src/gui/welcome_window.hpp
index 27bb2178..71ae3d98 100644
--- a/src/gui/welcome_window.hpp
+++ b/src/gui/welcome_window.hpp
@@ -32,7 +32,10 @@ class WelcomeWindow : public Frame {
 	DECLARE_EVENT_TABLE();
 	
 	// MSE logos
-	Bitmap logo, logo2;
+	Bitmap logo;
+	#if USE_BETA_LOGO
+	Bitmap logo2;
+	#endif
 		
 	void onPaint(wxPaintEvent&);
 	void draw(DC& dc);