From 3e0a33c0e334cbfbe304d08c332c4ecb8787db66 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Thu, 23 Jun 2005 11:58:09 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=6416
---
 checkin_notes                |   7 +++
 clientgui/mac/MacSysMenu.cpp |   5 ++
 clientgui/res/boinc_mac.xpm  | 113 +++++++++++++++++++++++++++++++++++
 3 files changed, 125 insertions(+)
 create mode 100644 clientgui/res/boinc_mac.xpm

diff --git a/checkin_notes b/checkin_notes
index 35140aadd6..834fb78a5d 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -8348,3 +8348,10 @@ David 23 June 2005
         handle_request.C
         sched_send.C
         server_types.C
+
+Charlie    23 June 2005
+    Mac: add a separate icon for Mac menu bar.
+    
+    clientgui/
+        res/
+            boinc_mac.xpm (new)
diff --git a/clientgui/mac/MacSysMenu.cpp b/clientgui/mac/MacSysMenu.cpp
index 0e3967288f..6abe4d7c1d 100644
--- a/clientgui/mac/MacSysMenu.cpp
+++ b/clientgui/mac/MacSysMenu.cpp
@@ -27,7 +27,12 @@
 #include "DlgAbout.h"
 #include "Events.h"
 #include "wx/mac/private.h"     // for wxBitmapRefData::GetPictHandle
+
+#ifdef __APPLE__
+#include "../res/boinc_mac.xpm"
+#else
 #include "../res/boinc.xpm"
+#endif
 
 pascal OSStatus SysMenuEventHandler( EventHandlerCallRef inHandlerCallRef,
                                     EventRef inEvent, void* pData);
diff --git a/clientgui/res/boinc_mac.xpm b/clientgui/res/boinc_mac.xpm
new file mode 100644
index 0000000000..c10cc86624
--- /dev/null
+++ b/clientgui/res/boinc_mac.xpm
@@ -0,0 +1,113 @@
+// Berkeley Open Infrastructure for Network Computing
+// http://boinc.berkeley.edu
+// Copyright (C) 2005 University of California
+//
+// This is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation;
+// either version 2.1 of the License, or (at your option) any later version.
+//
+// This software is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// To view the GNU Lesser General Public License visit
+// http://www.gnu.org/copyleft/lesser.html
+// or write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+/* XPM */
+static const char *boinc_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 72 2",
+/* colors */
+"AA c none",
+"BA c #FFFFDEDE7B7B",
+"CA c #FFFFDEDE6B6B",
+"DA c #FFFFDEDE5252",
+"EA c #FFFFDEDE4A4A",
+"FA c #FFFFD6D63939",
+"GA c #FFFFCECE3939",
+"HA c #FFFFCECE2929",
+"IA c #F7F7CECE4A4A",
+"JA c #EFEFD6D69494",
+"KA c #EFEFBDBD3131",
+"LA c #E7E7D6D6BDBD",
+"MA c #E7E7BDBD5252",
+"NA c #DEDECECE9494",
+"OA c #DEDECECE8484",
+"PA c #D6D6ADAD3131",
+"AB c #D6D6A5A51818",
+"BB c #CECECECECECE",
+"CB c #CECEBDBD8C8C",
+"DB c #CECEB5B56B6B",
+"EB c #CECEA5A53939",
+"FB c #C6C6BDBDADAD",
+"GB c #BDBDA5A55252",
+"HB c #BDBD94942121",
+"IB c #B5B5B5B5D6D6",
+"JB c #A5A5ADADBDBD",
+"KB c #A5A59C9C9494",
+"LB c #A5A58C8C3939",
+"MB c #9C9CA5A5CECE",
+"NB c #94949C9CD6D6",
+"OB c #8C8C9494E7E7",
+"PB c #84847B7B7B7B",
+"AC c #7B7B8C8CDEDE",
+"BC c #7B7B7B7B7B7B",
+"CC c #73737B7BB5B5",
+"DC c #737363633939",
+"EC c #6B6B7B7BD6D6",
+"FC c #6B6B73739C9C",
+"GC c #6B6B6B6B7373",
+"HC c #63637373E7E7",
+"IC c #5A5A52524A4A",
+"JC c #52526363C6C6",
+"KC c #4A4A6363D6D6",
+"LC c #4A4A5A5AD6D6",
+"MC c #4A4A5A5AC6C6",
+"NC c #4A4A52528C8C",
+"OC c #42425A5ABDBD",
+"PC c #42425252ADAD",
+"AD c #424252529C9C",
+"BD c #39395A5ADEDE",
+"CD c #39394A4AADAD",
+"DD c #393942427373",
+"ED c #31315252C6C6",
+"FD c #29294242A5A5",
+"GD c #292939399494",
+"HD c #292931317373",
+"ID c #21215252DEDE",
+"JD c #21214A4ACECE",
+"KD c #21214242BDBD",
+"LD c #21213939A5A5",
+"MD c #212139398484",
+"ND c #18183939ADAD",
+"OD c #181831319494",
+"PD c #181831318C8C",
+"AE c #10104242CECE",
+"BE c #101029298C8C",
+"CE c #101029297373",
+"DE c #08083939B5B5",
+"EE c #08083131A5A5",
+"FE c #080829299494",
+"GE c #080829298C8C",
+"HE c #000018187373",
+/* pixels */
+"AAAAAAAAAAAAMBACACMBMBAAAAAAAAAA",
+"AAAAAAAAIBCEPDGDBEBECEACAAAAAAAA",
+"AAAAAAIBGDGDDDGCPBBCNCBEMBAAAAAA",
+"AAAAIBODPDICKAGACAEAKAGCGEMBAAAA",
+"AAAAGEFDMDGBGACACCGBHACBLDHEMBAA",
+"AAIBODFDGDDCHANAHDHBBAJBLDGEACAA",
+"AAFDNDPCHDHBFADBEBIAJBCDPCFEKDAA",
+"AAEDODOCICHADAFBOAGAKAPBOCNDCEAA",
+"AALCKDADLBHAJAJCPCMAHAOAMCEEKDAA",
+"AAOBFDCDPAEAIBKCDDABEAIBJCEEJBAA",
+"AAIBDEPCDBGAKBBCEBIALAACKDGEAAAA",
+"AAAAOBKDFCCAEADABABBACEDFDMBAAAA",
+"AAAAIBOBJDECMBNBOBHCBDKDMBAAAAAA",
+"AAAAAAIBOBFEAEIDAEDEOBMBAAAAAAAA",
+"AAAAAAAAAAIBMBACJBIBAAAAAAAAAAAA",
+"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"};