From 3ca507a6eb1cecbf40a907a52c27128efb666ec0 Mon Sep 17 00:00:00 2001
From: s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>
Date: Mon, 21 Jun 2010 01:33:44 +0000
Subject: fixed colors on ubuntu lucid, enabled -O2 in makefile.unix, boost
 removed -mt from their library names in 1.40, updated bitcoin icon,
 hashmeter, generated and hashmeter log entries -- version 0.2.13

---
 ui.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'ui.cpp')

diff --git a/ui.cpp b/ui.cpp
index a21cd436c..6a1f6bafa 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -250,7 +250,8 @@ CMainFrame::CMainFrame(wxWindow* parent) : CMainFrameBase(parent)
 #ifdef __WXMSW__
     SetIcon(wxICON(bitcoin));
 #else
-    SetIcon(bitcoin16_xpm);
+    SetIcon(bitcoin20_xpm);
+    SetBackgroundColour(m_toolBar->GetBackgroundColour());
     wxFont fontTmp = m_staticText41->GetFont();
     fontTmp.SetFamily(wxFONTFAMILY_TELETYPE);
     m_staticTextBalance->SetFont(fontTmp);
@@ -374,13 +375,13 @@ void CMainFrame::OnIconize(wxIconizeEvent& event)
     // to get rid of the deprecated warning.  Just ignore it.
     if (!event.Iconized())
         fClosedToTray = false;
-#ifndef __WXMSW__
-    // Tray is not reliable on ubuntu 9.10 gnome
-    fClosedToTray = false;
-#endif
+#ifdef __WXMSW__
+    // The tray icon sometimes disappears on ubuntu karmic
+    // Hiding the taskbar button doesn't work reliably on ubuntu lucid
     if (fMinimizeToTray && event.Iconized())
         fClosedToTray = true;
     Show(!fClosedToTray);
+#endif
     ptaskbaricon->Show(fMinimizeToTray || fClosedToTray);
 }
 
-- 
cgit v1.2.3