Commit 04ba8492 authored by twanvl's avatar twanvl

no longer use the "beta" logo, in preparation of 2.0.0 release

parent 6f1af630
...@@ -17,7 +17,9 @@ ...@@ -17,7 +17,9 @@
AboutWindow::AboutWindow(Window* parent) AboutWindow::AboutWindow(Window* parent)
: wxDialog(parent, wxID_ANY, _TITLE_("about"), wxDefaultPosition, wxSize(510,340), wxCLIP_CHILDREN | wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL) : wxDialog(parent, wxID_ANY, _TITLE_("about"), wxDefaultPosition, wxSize(510,340), wxCLIP_CHILDREN | wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL)
, logo (load_resource_image(_("about"))) , logo (load_resource_image(_("about")))
#if USE_BETA_LOGO
, logo2(load_resource_image(_("two_beta"))) , logo2(load_resource_image(_("two_beta")))
#endif
{ {
// init controls // init controls
wxControl* ok_button = new HoverButton(this, wxID_OK, _("btn_ok")); wxControl* ok_button = new HoverButton(this, wxID_OK, _("btn_ok"));
...@@ -38,7 +40,9 @@ void AboutWindow::draw(DC& dc) { ...@@ -38,7 +40,9 @@ void AboutWindow::draw(DC& dc) {
dc.DrawRectangle(0, 0, ws.GetWidth(), ws.GetHeight()); dc.DrawRectangle(0, 0, ws.GetWidth(), ws.GetHeight());
// draw logo // draw logo
dc.DrawBitmap(logo, (ws.GetWidth() - logo.GetWidth()) / 2, 5); 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 // draw version box
dc.SetPen (wxPen(Color(184,29,19), 2)); dc.SetPen (wxPen(Color(184,29,19), 2));
dc.SetBrush(Color(114,197,224)); dc.SetBrush(Color(114,197,224));
......
...@@ -20,9 +20,12 @@ class AboutWindow : public wxDialog { ...@@ -20,9 +20,12 @@ class AboutWindow : public wxDialog {
private: private:
DECLARE_EVENT_TABLE(); DECLARE_EVENT_TABLE();
// graphics // MSE logos
Bitmap logo, logo2; Bitmap logo;
#if USE_BETA_LOGO
Bitmap logo2;
#endif
void onPaint(wxPaintEvent&); void onPaint(wxPaintEvent&);
void draw(DC& dc); void draw(DC& dc);
......
...@@ -32,7 +32,10 @@ class WelcomeWindow : public Frame { ...@@ -32,7 +32,10 @@ class WelcomeWindow : public Frame {
DECLARE_EVENT_TABLE(); DECLARE_EVENT_TABLE();
// MSE logos // MSE logos
Bitmap logo, logo2; Bitmap logo;
#if USE_BETA_LOGO
Bitmap logo2;
#endif
void onPaint(wxPaintEvent&); void onPaint(wxPaintEvent&);
void draw(DC& dc); void draw(DC& dc);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment